diff --git a/assets/scripts/app/templates/annotations/list.hbs b/assets/scripts/app/templates/annotations/list.hbs
new file mode 100644
index 00000000..c7b844a3
--- /dev/null
+++ b/assets/scripts/app/templates/annotations/list.hbs
@@ -0,0 +1,8 @@
+
+ {{#each annotation in view.annotations}}
+
+ {{/each}}
+
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index 71d35158..ee75d356 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -54,11 +54,7 @@
{{#unless build.isMatrix}}
-
- {{#each annotation in build.jobs.firstObject.annotations}}
-
- {{/each}}
-
+ {{view Travis.AnnotationsView annotationsBinding="build.jobs.firstObject.annotations"}}
{{/unless}}
{{#if build.isMatrix}}
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index ff06f46b..efc8e887 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -48,11 +48,7 @@
{{formatConfig job.config}}
-
- {{#each annotation in view.annotations}}
-
- {{/each}}
-
+ {{view Travis.AnnotationsView annotationsBinding="view.annotations"}}
{{view Travis.LogView jobBinding="job"}}
diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee
index a6e32a0d..e04d9e37 100644
--- a/assets/scripts/app/views.coffee
+++ b/assets/scripts/app/views.coffee
@@ -25,6 +25,7 @@ Travis.GettingStartedView = Travis.View.extend
templateName: 'no_owned_repos'
require 'views/accounts'
+require 'views/annotation'
require 'views/application'
require 'views/build'
require 'views/events'
diff --git a/assets/scripts/app/views/annotation.coffee b/assets/scripts/app/views/annotation.coffee
new file mode 100644
index 00000000..712f10a0
--- /dev/null
+++ b/assets/scripts/app/views/annotation.coffee
@@ -0,0 +1,4 @@
+Travis.reopen
+ AnnotationsView: Travis.View.extend
+ templateName: 'annotations/list'
+