diff --git a/src/main/twirl/datepicker.scala.html b/src/main/twirl/datepicker.scala.html
deleted file mode 100644
index 0247315..0000000
--- a/src/main/twirl/datepicker.scala.html
+++ /dev/null
@@ -1,11 +0,0 @@
-@(name: String, value: Option[java.util.Date])
-@import view.helpers
-<div id="@name" class="input-append date" data-date-format="yyyy-mm-dd" data-date="@value.map(helpers.date)">
-  <input class="span2" name="@name" type="text" readonly="" value="@value.map(helpers.date)" size="16"/>
-  <span class="add-on"><i class="icon-calendar"></i></span>
-</div>
-<script>
-$(function(){
-  $('#@name').datepicker();
-});
-</script>
diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/diff.scala.html
deleted file mode 100644
index 0360230..0000000
--- a/src/main/twirl/diff.scala.html
+++ /dev/null
@@ -1,101 +0,0 @@
-@(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@diffs.zipWithIndex.map { case (diff, i) =>
-  <a name="diff-@i"></a>
-  <table class="table table-bordered">
-    <tr>
-      <th style="font-weight: normal;" class="box-header">
-        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-          @diff.oldPath -> @diff.newPath
-        }
-        @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
-          @diff.newPath
-        }
-        @if(diff.changeType == ChangeType.DELETE){
-          @diff.oldPath
-        }
-        @if(commitId.isDefined){
-          <div class="pull-right align-right">
-            <a href="@url(repository)/blob/@commitId.get/@diff.newPath" class="btn btn-small">View file @@ @commitId.get.substring(0, 10)</a>
-          </div>
-        }
-      </th>
-    </tr>
-    <tr>
-      <td>
-        @if(diff.newContent != None || diff.oldContent != None){
-          <div id="diffText-@i"></div>
-          <textarea id="newText-@i" style="display: none;">@diff.newContent.getOrElse("")</textarea>
-          <textarea id="oldText-@i" style="display: none;">@diff.oldContent.getOrElse("")</textarea>
-        } else {
-          Not supported
-        }
-      </td>
-    </tr>
-  </table>
-}
-<script type="text/javascript" src="@assets/jsdifflib/difflib.js"></script>
-<script type="text/javascript" src="@assets/jsdifflib/diffview.js"></script>
-<link href="@assets/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
-<style type="text/css">
-table.inlinediff {
-  width: 100%;
-}
-
-table.inlinediff thead {
-  display: none;
-}
-
-td.insert, td.equal, td.delete {
-  width: 100%;
-}
-</style>
-<script>
-function diffUsingJS(oldTextId, newTextId, outputId) {
-  // get the baseText and newText values from the two textboxes, and split them into lines
-  var oldText = document.getElementById(oldTextId).value;
-  if(oldText == ''){
-    var oldLines = [];
-  } else {
-    var oldLines = difflib.stringAsLines(oldText);
-  }
-    
-  var newText = document.getElementById(newTextId).value
-  if(newText == ''){
-    var newLines = [];
-  } else {
-    var newLines = difflib.stringAsLines(newText);
-  }
-
-  // create a SequenceMatcher instance that diffs the two sets of lines
-  var sm = new difflib.SequenceMatcher(oldLines, newLines);
-
-  // get the opcodes from the SequenceMatcher instance
-  // opcodes is a list of 3-tuples describing what changes should be made to the base text
-  // in order to yield the new text
-  var opcodes = sm.get_opcodes();
-  var diffoutputdiv = document.getElementById(outputId);
-  while (diffoutputdiv.firstChild) diffoutputdiv.removeChild(diffoutputdiv.firstChild);
-
-  // build the diff view and add it to the current DOM
-  diffoutputdiv.appendChild(diffview.buildView({
-    baseTextLines: oldLines,
-    newTextLines: newLines,
-    opcodes: opcodes,
-    contextSize: 4,
-    viewType: 1
-  }));
-}
-
-$(function(){
-  @diffs.zipWithIndex.map { case (diff, i) =>
-    @if(diff.newContent != None || diff.oldContent != None){
-      if($('#oldText-@i').length > 0){
-        diffUsingJS('oldText-@i', 'newText-@i', 'diffText-@i');
-      }
-    }
-  }
-});
-</script>
\ No newline at end of file
diff --git a/src/main/twirl/helper/datepicker.scala.html b/src/main/twirl/helper/datepicker.scala.html
new file mode 100644
index 0000000..0247315
--- /dev/null
+++ b/src/main/twirl/helper/datepicker.scala.html
@@ -0,0 +1,11 @@
+@(name: String, value: Option[java.util.Date])
+@import view.helpers
+<div id="@name" class="input-append date" data-date-format="yyyy-mm-dd" data-date="@value.map(helpers.date)">
+  <input class="span2" name="@name" type="text" readonly="" value="@value.map(helpers.date)" size="16"/>
+  <span class="add-on"><i class="icon-calendar"></i></span>
+</div>
+<script>
+$(function(){
+  $('#@name').datepicker();
+});
+</script>
diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html
new file mode 100644
index 0000000..0360230
--- /dev/null
+++ b/src/main/twirl/helper/diff.scala.html
@@ -0,0 +1,101 @@
+@(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@diffs.zipWithIndex.map { case (diff, i) =>
+  <a name="diff-@i"></a>
+  <table class="table table-bordered">
+    <tr>
+      <th style="font-weight: normal;" class="box-header">
+        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
+          @diff.oldPath -> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
+          @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.DELETE){
+          @diff.oldPath
+        }
+        @if(commitId.isDefined){
+          <div class="pull-right align-right">
+            <a href="@url(repository)/blob/@commitId.get/@diff.newPath" class="btn btn-small">View file @@ @commitId.get.substring(0, 10)</a>
+          </div>
+        }
+      </th>
+    </tr>
+    <tr>
+      <td>
+        @if(diff.newContent != None || diff.oldContent != None){
+          <div id="diffText-@i"></div>
+          <textarea id="newText-@i" style="display: none;">@diff.newContent.getOrElse("")</textarea>
+          <textarea id="oldText-@i" style="display: none;">@diff.oldContent.getOrElse("")</textarea>
+        } else {
+          Not supported
+        }
+      </td>
+    </tr>
+  </table>
+}
+<script type="text/javascript" src="@assets/jsdifflib/difflib.js"></script>
+<script type="text/javascript" src="@assets/jsdifflib/diffview.js"></script>
+<link href="@assets/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<style type="text/css">
+table.inlinediff {
+  width: 100%;
+}
+
+table.inlinediff thead {
+  display: none;
+}
+
+td.insert, td.equal, td.delete {
+  width: 100%;
+}
+</style>
+<script>
+function diffUsingJS(oldTextId, newTextId, outputId) {
+  // get the baseText and newText values from the two textboxes, and split them into lines
+  var oldText = document.getElementById(oldTextId).value;
+  if(oldText == ''){
+    var oldLines = [];
+  } else {
+    var oldLines = difflib.stringAsLines(oldText);
+  }
+    
+  var newText = document.getElementById(newTextId).value
+  if(newText == ''){
+    var newLines = [];
+  } else {
+    var newLines = difflib.stringAsLines(newText);
+  }
+
+  // create a SequenceMatcher instance that diffs the two sets of lines
+  var sm = new difflib.SequenceMatcher(oldLines, newLines);
+
+  // get the opcodes from the SequenceMatcher instance
+  // opcodes is a list of 3-tuples describing what changes should be made to the base text
+  // in order to yield the new text
+  var opcodes = sm.get_opcodes();
+  var diffoutputdiv = document.getElementById(outputId);
+  while (diffoutputdiv.firstChild) diffoutputdiv.removeChild(diffoutputdiv.firstChild);
+
+  // build the diff view and add it to the current DOM
+  diffoutputdiv.appendChild(diffview.buildView({
+    baseTextLines: oldLines,
+    newTextLines: newLines,
+    opcodes: opcodes,
+    contextSize: 4,
+    viewType: 1
+  }));
+}
+
+$(function(){
+  @diffs.zipWithIndex.map { case (diff, i) =>
+    @if(diff.newContent != None || diff.oldContent != None){
+      if($('#oldText-@i').length > 0){
+        diffUsingJS('oldText-@i', 'newText-@i', 'diffText-@i');
+      }
+    }
+  }
+});
+</script>
\ No newline at end of file
diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
new file mode 100644
index 0000000..d5e2c11
--- /dev/null
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -0,0 +1,10 @@
+@(body: Html)
+<div class="btn-group">
+  <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+    <i class="icon-cog"></i>
+    <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu">
+    @body
+  </ul>
+</div>
diff --git a/src/main/twirl/helper/paginator.scala.html b/src/main/twirl/helper/paginator.scala.html
new file mode 100644
index 0000000..4a37d81
--- /dev/null
+++ b/src/main/twirl/helper/paginator.scala.html
@@ -0,0 +1,34 @@
+@(page: Int, count: Int, limit: Int, width: Int, baseURL: String)
+@defining(view.Pagination(page, count, service.IssuesService.IssueLimit, width)){ p =>
+  @if(p.count > p.limit){
+    <div class="pagination">
+      <ul>
+        @if(page == 1){
+        <li class="disabled"><span>&#9664;</span></li>
+        } else {
+        <li><a href="@baseURL&page=@(page - 1)">&#9664;</a></li>
+        }
+        @for(i <- 1 to p.max){
+        @if(i == p.max && p.omitRight){
+        <li><span>&hellip;</span></li>
+        }
+        @if(i == page){
+        <li class="active"><span>@i</span></li>
+        } else {
+        @if(p.visibleFor(i)){
+        <li><a href="@baseURL&page=@i">@i</a></li>
+        }
+        }
+        @if(i == 1 && p.omitLeft){
+        <li><span>&hellip;</span></li>
+        }
+        }
+        @if(page == p.max){
+        <li class="disabled"><span>&#9654;</span></li>
+        } else {
+        <li><a href="@baseURL&page=@(page + 1)">&#9654;</a></li>
+        }
+      </ul>
+    </div>
+  }
+}
diff --git a/src/main/twirl/helper/preview.scala.html b/src/main/twirl/helper/preview.scala.html
new file mode 100644
index 0000000..642c3bc
--- /dev/null
+++ b/src/main/twirl/helper/preview.scala.html
@@ -0,0 +1,43 @@
+@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean,
+  enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
+@import context._
+@import view.helpers._
+<div class="tabbable">
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#tab1" data-toggle="tab">Write</a></li>
+    <li><a href="#tab2" data-toggle="tab" id="preview">Preview</a></li>
+    @*
+    <li class="pull-right">
+      <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Syntax Guide</a>
+    </li>
+    *@
+  </ul>
+  <div class="tab-content">
+    <div class="tab-pane active" id="tab1">
+      <span id="error-content" class="error"></span>
+      <textarea id="content" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
+    </div>
+    <div class="tab-pane" id="tab2">
+      <div class="markdown-body" id="preview-area">
+      </div>
+    </div>
+  </div>
+</div>
+<link  href="@assets/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
+<script src="@assets/google-code-prettify/prettify.js"></script>
+<script>
+$(function(){
+  $('#preview').click(function(){
+    $('#preview-area').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
+    $.post('@url(repository)/_preview', {
+      content          : $('#content').val(),
+      enableWikiLink   : @enableWikiLink,
+      enableCommitLink : @enableCommitLink,
+      enableIssueLink  : @enableIssueLink
+    }, function(data){
+      $('#preview-area').html(data);
+      prettyPrint();
+    });
+  });
+});
+</script>
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 123cde0..9e40430 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -14,39 +14,27 @@
           <div>
             <span id="label-assigned">No one is assigned</span>
             <input type="hidden" name="assignedUserName" value=""/>
-            <div class="btn-group">
-              <button class="btn dropdown-toggle" data-toggle="dropdown">
-                <i class="icon-cog"></i>
-                <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu">
-                <li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
-                <li class="divider"></li>
-                @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
-                }
-              </ul>
-            </div>
+            @helper.html.dropdown {
+              <li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
+              <li class="divider"></li>
+              @collaborators.map { collaborator =>
+                <li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
+              }
+            }
             <div class="pull-right">
               <span id="label-milestone">No milestone</span>
               <input type="hidden" name="milestoneId" value=""/>
-              <div class="btn-group">
-                <button class="btn dropdown-toggle" data-toggle="dropdown">
-                  <i class="icon-cog"></i>
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="javascript:void(0);" class="milestone" data-id="">No milestone</a></li>
-                  <li class="divider"></li>
-                  @milestones.map { milestone =>
-                    <li><a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
-                  }
-                </ul>
-              </div>
+              @helper.html.dropdown {
+                <li><a href="javascript:void(0);" class="milestone" data-id="">No milestone</a></li>
+                <li class="divider"></li>
+                @milestones.map { milestone =>
+                  <li><a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
+                }
+              }
             </div>
           </div>
           <hr>
-          @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
+          @helper.html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
         </div>
       </div>
       <input type="submit" class="btn btn-success" value="Submit new issue"/>
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 749a703..5eb8634 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -48,7 +48,7 @@
       <form action="@url(repository)/issue_comments/new" method="POST" validate="true">
       <div class="box">
         <div class="box-content">
-          @html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
+          @helper.html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
         </div>
       </div>
       <input type="hidden" name="issueId" value="@issue.issueId"/>
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index 0834e7e..51fba6f 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -41,21 +41,15 @@
           <span class="muted small">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title)
         }
       }
-      <div class="btn-group">
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          <i class="icon-cog"></i>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          @if(condition.milestoneId.isDefined){
-            <li><a href="@condition.copy(milestoneId = None).toURL">Clear milestone filter</a></li>
-          }
-          <li><a href="@condition.copy(milestoneId = Some(None)).toURL">Issues with no milestone</a></li>
-          @milestones.map { milestone =>
-            <li><a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">@milestone.title</a></li>
-          }
-        </ul>
-      </div>
+      @helper.html.dropdown {
+        @if(condition.milestoneId.isDefined){
+          <li><a href="@condition.copy(milestoneId = None).toURL">Clear milestone filter</a></li>
+        }
+        <li><a href="@condition.copy(milestoneId = Some(None)).toURL">Issues with no milestone</a></li>
+        @milestones.map { milestone =>
+          <li><a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">@milestone.title</a></li>
+        }
+      }
       @if(condition.milestoneId.isDefined && condition.milestoneId.get.isDefined){
         <div class="milestone-progress" style="margin-top: 8px;">
           @if(closedCount > 0){
@@ -97,7 +91,7 @@
         </a>
       }
       <div class="pull-right">
-        @html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
       </div>
       <div class="btn-group">
         <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
@@ -160,7 +154,7 @@
       }
       </table>
       <div class="pull-right">
-        @html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
       </div>
     </div>
   </div>
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index 1e2513f..02461c3 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -17,7 +17,7 @@
     </fieldset>
     <fieldset>
       <label for="dueDate"><strong>Due Date</strong></label>
-      @html.datepicker("dueDate", milestone.flatMap(_.dueDate))
+      @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
       <span id="error-dueDate" class="error"></span>
     </fieldset>
     <hr>
diff --git a/src/main/twirl/paginator.scala.html b/src/main/twirl/paginator.scala.html
deleted file mode 100644
index 4a37d81..0000000
--- a/src/main/twirl/paginator.scala.html
+++ /dev/null
@@ -1,34 +0,0 @@
-@(page: Int, count: Int, limit: Int, width: Int, baseURL: String)
-@defining(view.Pagination(page, count, service.IssuesService.IssueLimit, width)){ p =>
-  @if(p.count > p.limit){
-    <div class="pagination">
-      <ul>
-        @if(page == 1){
-        <li class="disabled"><span>&#9664;</span></li>
-        } else {
-        <li><a href="@baseURL&page=@(page - 1)">&#9664;</a></li>
-        }
-        @for(i <- 1 to p.max){
-        @if(i == p.max && p.omitRight){
-        <li><span>&hellip;</span></li>
-        }
-        @if(i == page){
-        <li class="active"><span>@i</span></li>
-        } else {
-        @if(p.visibleFor(i)){
-        <li><a href="@baseURL&page=@i">@i</a></li>
-        }
-        }
-        @if(i == 1 && p.omitLeft){
-        <li><span>&hellip;</span></li>
-        }
-        }
-        @if(page == p.max){
-        <li class="disabled"><span>&#9654;</span></li>
-        } else {
-        <li><a href="@baseURL&page=@(page + 1)">&#9654;</a></li>
-        }
-      </ul>
-    </div>
-  }
-}
diff --git a/src/main/twirl/preview.scala.html b/src/main/twirl/preview.scala.html
deleted file mode 100644
index 642c3bc..0000000
--- a/src/main/twirl/preview.scala.html
+++ /dev/null
@@ -1,43 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean,
-  enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
-@import context._
-@import view.helpers._
-<div class="tabbable">
-  <ul class="nav nav-tabs">
-    <li class="active"><a href="#tab1" data-toggle="tab">Write</a></li>
-    <li><a href="#tab2" data-toggle="tab" id="preview">Preview</a></li>
-    @*
-    <li class="pull-right">
-      <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Syntax Guide</a>
-    </li>
-    *@
-  </ul>
-  <div class="tab-content">
-    <div class="tab-pane active" id="tab1">
-      <span id="error-content" class="error"></span>
-      <textarea id="content" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
-    </div>
-    <div class="tab-pane" id="tab2">
-      <div class="markdown-body" id="preview-area">
-      </div>
-    </div>
-  </div>
-</div>
-<link  href="@assets/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
-<script src="@assets/google-code-prettify/prettify.js"></script>
-<script>
-$(function(){
-  $('#preview').click(function(){
-    $('#preview-area').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
-    $.post('@url(repository)/_preview', {
-      content          : $('#content').val(),
-      enableWikiLink   : @enableWikiLink,
-      enableCommitLink : @enableCommitLink,
-      enableIssueLink  : @enableIssueLink
-    }, function(data){
-      $('#preview-area').html(data);
-      prettyPrint();
-    });
-  });
-});
-</script>
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index f646de3..479baa4 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -93,7 +93,7 @@
     </li>
   }
   </ul>
-  @html.diff(diffs, repository, Some(commit.id))
+  @helper.html.diff(diffs, repository, Some(commit.id))
 }
 <script>
 $(function(){
diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html
index 7496e0f..41f6d36 100644
--- a/src/main/twirl/wiki/compare.scala.html
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -20,5 +20,5 @@
       </div>
     </li>
   </ul>
-  @html.diff(diffs, repository, None)
+  @helper.html.diff(diffs, repository, None)
 }
diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
index 3d302be..963978d 100644
--- a/src/main/twirl/wiki/edit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -21,7 +21,7 @@
   <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
+    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
     <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
     <input type="hidden" name="currentPageName" value="@pageName"/>
     <input type="submit" value="Save" class="btn btn-success">