diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html
index 43928bc..9e517ab 100644
--- a/src/main/twirl/helper/diff.scala.html
+++ b/src/main/twirl/helper/diff.scala.html
@@ -1,10 +1,39 @@
 @(diffs: Seq[util.JGitUtil.DiffInfo],
  repository: service.RepositoryService.RepositoryInfo,
  newCommitId: Option[String],
- oldCommitId: Option[String])(implicit context: app.Context)
+ oldCommitId: Option[String],
+ showIndex: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@if(showIndex){
+  <div>
+    <div class="pull-right" style="margin-bottom: 10px;">
+      <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
+    </div>
+    Showing @diffs.size changed @plural(diffs.size, "file")
+  </div>
+  <ul id="commit-file-list" style="display: none;">
+  @diffs.zipWithIndex.map { case (diff, i) =>
+    <li@if(i > 0){ class="border"}>
+      <a href="#diff-@i">
+        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
+          <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.ADD){
+          <img src="@assets/common/images/diff_add.png"/> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.MODIFY){
+          <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.DELETE){
+          <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
+        }
+      </a>
+    </li>
+    }
+  </ul>
+}
 @diffs.zipWithIndex.map { case (diff, i) =>
   <a name="diff-@i"></a>
   <table class="table table-bordered">
@@ -103,6 +132,17 @@
 }
 
 $(function(){
+  @if(showIndex){
+    $('#toggle-file-list').click(function(){
+      $('#commit-file-list').toggle();
+      if($(this).val() == 'Show file list'){
+        $(this).val('Hide file list');
+      } else {
+        $(this).val('Show file list');
+      }
+    });
+  }
+
   @diffs.zipWithIndex.map { case (diff, i) =>
     @if(diff.newContent != None || diff.oldContent != None){
       if($('#oldText-@i').length > 0){
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
index 202294a..8b5493b 100644
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -12,7 +12,6 @@
   hasWritePermission: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @html.main("Pull Requests - " + repository.owner + "/" + repository.name){
   @html.header("pulls", repository)
   <div class="pullreq-info">
@@ -108,33 +107,7 @@
         }
       </table>
     </div>
-    <div>
-      <div class="pull-right" style="margin-bottom: 10px;">
-        <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
-      </div>
-      Showing @diffs.size changed @plural(diffs.size, "file")
-    </div>
-    <ul id="commit-file-list" style="display: none;">
-    @diffs.zipWithIndex.map { case (diff, i) =>
-      <li@if(i > 0){ class="border"}>
-        <a href="#diff-@i">
-          @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-            <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.ADD){
-            <img src="@assets/common/images/diff_add.png"/> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.MODIFY){
-            <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.DELETE){
-            <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
-          }
-        </a>
-      </li>
-      }
-    </ul>
-    @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId))
+    @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true)
   }
 }
 <script>
@@ -172,14 +145,5 @@
     $(this).hide();
     $('#pull-request-form').show();
   });
-
-  $('#toggle-file-list').click(function(){
-    $('#commit-file-list').toggle();
-    if($(this).val() == 'Show file list'){
-      $(this).val('Hide file list');
-    } else {
-      $(this).val('Show file list');
-    }
-  });
 });
 </script>
diff --git a/src/main/twirl/pulls/files.scala.html b/src/main/twirl/pulls/files.scala.html
deleted file mode 100644
index d94312d..0000000
--- a/src/main/twirl/pulls/files.scala.html
+++ /dev/null
@@ -1,49 +0,0 @@
-@(issue: model.Issue,
-  pullreq: model.PullRequest,
-  diffs: Seq[util.JGitUtil.DiffInfo],
-  newCommitId: String,
-  oldCommitId: String,
-  hasWritePermission: Boolean,
-  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-<div>
-  <div class="pull-right" style="margin-bottom: 10px;">
-    <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
-  </div>
-  Showing @diffs.size changed @plural(diffs.size, "file")
-</div>
-<ul id="commit-file-list" style="display: none;">
-@diffs.zipWithIndex.map { case (diff, i) =>
-  <li@if(i > 0){ class="border"}>
-    <a href="#diff-@i">
-      @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-        <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.ADD){
-        <img src="@assets/common/images/diff_add.png"/> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.MODIFY){
-        <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.DELETE){
-        <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
-      }
-    </a>
-  </li>
-}
-</ul>
-@helper.html.diff(diffs, repository, Some(newCommitId), Some(oldCommitId))
-<script>
-$(function(){
-  $('#toggle-file-list').click(function(){
-    $('#commit-file-list').toggle();
-    if($(this).val() == 'Show file list'){
-      $(this).val('Hide file list');
-    } else {
-      $(this).val('Show file list');
-    }
-  });
-});
-</script>
diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html
index 6c66d8a..1a879b4 100644
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -45,7 +45,7 @@
         @pulls.html.commits(issue, pullreq, dayByDayCommits, hasWritePermission, repository)
       </div>
       <div class="tab-pane" id="files">
-        @pulls.html.files(issue, pullreq, diffs, commits.head.id, commits.last.id, hasWritePermission, repository)
+        @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true)
       </div>
     </div>
   }
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index fac4c2f..17cef3b 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -8,7 +8,6 @@
 @import context._
 @import view.helpers._
 @import util.Implicits._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @html.main(commit.shortMessage, Some(repository)){
   @html.header("code", repository)
   @tab(commitId, repository, "commits")
@@ -71,52 +70,10 @@
       </td>
     </tr>
   </table>
-  <div>
-    <div class="pull-right" style="margin-bottom: 10px;">
-      <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
-    </div>
-    Showing @diffs.size changed @plural(diffs.size, "file")
-    @*
-    @if(diffs.size == 1){
-      Showing 1 changed file
-    } else {
-      Showing @diffs.size changed files
-    }
-    *@
-  </div>
-  <ul id="commit-file-list" style="display: none;">
-  @diffs.zipWithIndex.map { case (diff, i) =>
-    <li@if(i > 0){ class="border"}>
-      <a href="#diff-@i">
-        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-          <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
-        }
-        @if(diff.changeType == ChangeType.ADD){
-          <img src="@assets/common/images/diff_add.png"/> @diff.newPath
-        }
-        @if(diff.changeType == ChangeType.MODIFY){
-          <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
-        }
-        @if(diff.changeType == ChangeType.DELETE){
-          <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
-        }
-      </a>
-    </li>
-  }
-  </ul>
-  @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId)
+  @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true)
 }
 <script>
 $(function(){
-  $('#toggle-file-list').click(function(){
-    $('#commit-file-list').toggle();
-    if($(this).val() == 'Show file list'){
-      $(this).val('Hide file list');
-    } else {
-      $(this).val('Show file list');
-    }
-  });
-
   $('a.branch:first, a.tag:first').css({
     'font-weight': 'bold',
     'color': '#555555'
diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html
index d4f66d9..f03cdfb 100644
--- a/src/main/twirl/wiki/compare.scala.html
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -22,5 +22,5 @@
       </div>
     </li>
   </ul>
-  @helper.html.diff(diffs, repository, None, None)
+  @helper.html.diff(diffs, repository, None, None, false)
 }