diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index 080b669..33e5395 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -5,13 +5,14 @@
   latestCommit: gitbucket.core.util.JGitUtil.CommitInfo,
   hasWritePermission: Boolean,
   isBlame: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.helper.html.datetimeago
+@import gitbucket.core.helper.html.checkicon
+@gitbucket.core.html.main(s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
     <div class="head">
       <div class="pull-right hide-if-blame"><div class="btn-group">
-        <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>
+        <a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>
       </div></div>
       <div class="line-age-legend">
         <span>Newer</span>
@@ -29,71 +30,71 @@
         </ol>
         <span>Older</span>
       </div>
-      @helper.html.branchcontrol(
+      @gitbucket.core.helper.html.branchcontrol(
         branch,
         repository,
         hasWritePermission
       ){
         @repository.branchList.map { x =>
-          <li><a href="@url(repository)/blob/@encodeRefName(x)/@pathList.mkString("/")">@helper.html.checkicon(x == branch) @x</a></li>
+          <li><a href="@helpers.url(repository)/blob/@helpers.encodeRefName(x)/@pathList.mkString("/")">@checkicon(x == branch) @x</a></li>
         }
       }
-      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+      <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
       @pathList.zipWithIndex.map { case (section, i) =>
         @if(i == pathList.length - 1){
           @section
         } else {
-          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
       }
     </div>
     <div class="box-header">
-      @avatar(latestCommit, 28)
-      @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
-      <span class="muted">@helper.html.datetimeago(latestCommit.commitTime)</span>
-      <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
+      @helpers.avatar(latestCommit, 28)
+      @helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
+      <span class="muted">@datetimeago(latestCommit.commitTime)</span>
+      <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.summary, repository)</a>
       <div class="btn-group pull-right">
         @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){
-          <a class="btn btn-sm btn-default" href="@url(repository)/edit/@encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
+          <a class="btn btn-sm btn-default" href="@helpers.url(repository)/edit/@helpers.encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
         }
-        <a class="btn btn-sm btn-default" href="@url(repository)/raw/@latestCommit.id/@pathList.mkString("/")">Raw</a>
+        <a class="btn btn-sm btn-default" href="@helpers.url(repository)/raw/@latestCommit.id/@pathList.mkString("/")">Raw</a>
         @if(content.viewType == "text"){
-          <a class="btn btn-sm btn-default blame-action" href="@url(repository)/blame/@latestCommit.id/@pathList.mkString("/")" data-url="@url(repository)/get-blame/@latestCommit.id/@pathList.mkString("/")" data-repository="@url(repository)">Blame</a>
+          <a class="btn btn-sm btn-default blame-action" href="@helpers.url(repository)/blame/@latestCommit.id/@pathList.mkString("/")" data-url="@helpers.url(repository)/get-blame/@latestCommit.id/@pathList.mkString("/")" data-repository="@helpers.url(repository)">Blame</a>
         }
-        <a class="btn btn-sm btn-default" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
+        <a class="btn btn-sm btn-default" href="@helpers.url(repository)/commits/@helpers.encodeRefName(branch)/@pathList.mkString("/")">History</a>
         @if(hasWritePermission && repository.branchList.contains(branch)){
-          <a class="btn btn-sm btn-danger" href="@url(repository)/remove/@encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
+          <a class="btn btn-sm btn-danger" href="@helpers.url(repository)/remove/@helpers.encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
         }
       </div>
     </div>
       @if(content.viewType == "text"){
-        @defining(isRenderable(pathList.reverse.head)){ isRrenderable =>
-          @if(!isBlame && isRrenderable) {
+        @defining(helpers.isRenderable(pathList.reverse.head)){ isRenderable =>
+          @if(!isBlame && isRenderable) {
             <div class="box-content-bottom markdown-body" style="padding-left: 20px; padding-right: 20px;">
-              @renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
+              @helpers.renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
             </div>
           } else {
             <div class="box-content-bottom">
-              <pre class="prettyprint linenums blob @if(!isRrenderable){ no-renderable } ">@content.content.get</pre>
+              <pre class="prettyprint linenums blob @if(!isRenderable){ no-renderable } ">@content.content.get</pre>
             </div>
           }
         }
       }
       @if(content.viewType == "image"){
         <div class="box-content-bottom">
-          <img src="@url(repository)/raw/@encodeRefName(branch)/@pathList.mkString("/")"/>
+          <img src="@helpers.url(repository)/raw/@helpers.encodeRefName(branch)/@pathList.mkString("/")"/>
         </div>
       }
       @if(content.viewType == "large" || content.viewType == "binary"){
         <div class="box-content-bottom" style="text-align: center; padding-top: 20px; padding-bottom: 20px;">
-          <a href="@url(repository)/raw/@encodeRefName(branch)/@pathList.mkString("/")">View Raw</a><br>
+          <a href="@helpers.url(repository)/raw/@helpers.encodeRefName(branch)/@pathList.mkString("/")">View Raw</a><br>
           <br>
           (Sorry about that, but we can't show files that are this big right now)
         </div>
       }
   }
 }
-<script src="@assets/vendors/jquery/jquery.ba-hashchange.js"></script>
+<script src="@helpers.assets/vendors/jquery/jquery.ba-hashchange.js"></script>
 <script>
 $(window).load(function(){
   $(window).hashchange(function(){
diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
index 759d6b2..7163e5a 100644
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -1,10 +1,9 @@
 @(branchInfo: Seq[(gitbucket.core.util.JGitUtil.BranchInfo, Option[(gitbucket.core.model.PullRequest, gitbucket.core.model.Issue)], Boolean)],
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("branches", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("branches", repository){
     <table class="table table-bordered table-hover branches">
       <thead>
         <tr>
@@ -18,29 +17,29 @@
             <div class="branch-action">
               @branch.mergeInfo.map{ info =>
                 @prs.map{ case (pull, issue) =>
-                  <a href="@url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
+                  <a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
                   @if(issue.closed) {
                     @if(info.isMerged){
-                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-info">Merged</a>
+                      <a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-info">Merged</a>
                     } else {
-                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-important">Closed</a>
+                      <a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-important">Closed</a>
                     }
                   } else {
-                    <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-success">Open</a>
+                    <a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-success">Open</a>
                   }
                 }.getOrElse{
                   @if(context.loginAccount.isDefined){
-                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
-                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                    <a href="@helpers.url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                      helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)
                     }.getOrElse {
-                      encodeRefName(repository.repository.defaultBranch)
-                    }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-success">New Pull Request</a>
+                      helpers.encodeRefName(repository.repository.defaultBranch)
+                    }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-success">New Pull Request</a>
                   } else {
-                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
-                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                    <a href="@helpers.url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                      helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)
                     }.getOrElse {
-                      encodeRefName(repository.repository.defaultBranch)
-                    }}...@{encodeRefName(branch.name)}" class="btn btn-success">Compare</a>
+                      helpers.encodeRefName(repository.repository.defaultBranch)
+                    }}...@{helpers.encodeRefName(branch.name)}" class="btn btn-success">Compare</a>
                   }
                 }
                 @if(hasWritePermission){
@@ -51,7 +50,7 @@
                       @if(isProtected){
                         <a class="disabled" data-toggle="tooltip" title="You can’t delete a protected branch."><i class="octicon octicon-trashcan"></i></a>
                       } else {
-                        <a href="@url(repository)/delete/@encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
+                        <a href="@helpers.url(repository)/delete/@helpers.encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
                       }
                     }
                   </span>
@@ -60,10 +59,10 @@
             </div>
             <div class="branch-details">
               @if(isProtected){ <span class="octicon octicon-shield" title="This branch is protected"></span> }
-              <a href="@url(repository)/tree/@encodeRefName(branch.name)" class="branch-name">@branch.name</a>
+              <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch.name)" class="branch-name">@branch.name</a>
               <span class="branch-meta">
-                <span>Updated @helper.html.datetimeago(branch.commitTime, false)
-                  by <span>@user(branch.committerName, branch.committerEmailAddress, "muted-link")</span>
+                <span>Updated @gitbucket.core.helper.html.datetimeago(branch.commitTime, false)
+                  by <span>@helpers.user(branch.committerName, branch.committerEmailAddress, "muted-link")</span>
                 </span>
               </span>
             </div>
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
index 9de9416..8524b5e 100644
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -5,13 +5,12 @@
   issueId: Option[Int] = None,
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context.loginAccount
-@import gitbucket.core.view.helpers._
-@if(loginAccount.isDefined){
+@import gitbucket.core.view.helpers
+@if(context.loginAccount.isDefined){
   @if(!fileName.isDefined){<hr/><br/>}
   <form method="POST" validate="true" style="max-width: 874px;">
     @if(!fileName.isDefined){
-      <div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div>
+      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
     }
     <div class="panel panel-default issue-comment-box">
       <div class="panel-body">
@@ -31,13 +30,13 @@
       @if(fileName.isDefined){
         <div class="pull-right" style="margin-top: 10px;">
           <input type="button" class="btn btn-default" value="Cancel"/>
-          <input type="submit" class="btn btn-success btn-inline-comment" formaction="@url(repository)/commit/@commitId/comment/new" value="Comment"/>
+          <input type="submit" class="btn btn-success btn-inline-comment" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment"/>
         </div>
       }
     </div>
     @if(!fileName.isDefined){
       <div class="pull-right">
-        <input type="submit" class="btn btn-success" formaction="@url(repository)/commit/@commitId/comment/new" value="Comment on this commit"/>
+        <input type="submit" class="btn btn-success" formaction="@helpers.url(repository)/commit/@commitId/comment/new" value="Comment on this commit"/>
       </div>
     }
     @issueId.map { issueId => <input type="hidden" name="issueId" value="@issueId"> }
@@ -54,7 +53,7 @@
         param[v.name] = v.value;
       });
       $.ajax({
-        url: '@url(repository)/commit/@commitId/comment/_data/new',
+        url: '@helpers.url(repository)/commit/@commitId/comment/_data/new',
         type: 'POST',
         data: param
       }).done(function(data) {
diff --git a/src/main/twirl/gitbucket/core/repo/commit.scala.html b/src/main/twirl/gitbucket/core/repo/commit.scala.html
index dd42a83..32ff820 100644
--- a/src/main/twirl/gitbucket/core/repo/commit.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html
@@ -7,27 +7,26 @@
   diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
   oldCommitId: Option[String],
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.util.Implicits._
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(commit.shortMessage, Some(repository)){
-  @html.menu("files", repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.view.helpers.RichHtmlSeq
+@gitbucket.core.html.main(commit.shortMessage, Some(repository)){
+  @gitbucket.core.html.menu("files", repository){
     <table class="table table-bordered">
       <tr>
         <th class="box-header">
           <div class="pull-right align-right">
-            <a href="@url(repository)/tree/@commit.id" class="btn btn-small">Browse code</a>
+            <a href="@helpers.url(repository)/tree/@commit.id" class="btn btn-small">Browse code</a>
           </div>
-          <div class="commit-log">@link(commit.summary, repository)</div>
+          <div class="commit-log">@helpers.link(commit.summary, repository)</div>
           @if(commit.description.isDefined){
-            <pre class="commit-description">@link(commit.description.get, repository)</pre>
+            <pre class="commit-description">@helpers.link(commit.description.get, repository)</pre>
           }
           <div class="small" style="font-weight: normal;">
             @if(branches.nonEmpty){
               <span class="muted">
                   <i class="octicon octicon-git-branch"></i>
                 @branches.zipWithIndex.map { case (branch, i) =>
-                  <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
+                  <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
                 }
               </span>
             }
@@ -35,7 +34,7 @@
               <span class="muted">
                   <i class="octicon octicon-tag"></i>
                 @tags.zipWithIndex.map { case (tag, i) =>
-                  <a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
+                  <a href="@helpers.url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
                 }
               </span>
             }
@@ -51,7 +50,7 @@
               }
               @if(commit.parents.size == 1){
                 <span class="muted">1 parent</span>
-                <a href="@url(repository)/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a>
+                <a href="@helpers.url(repository)/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a>
               }
               <span class="muted">commit</span> @commit.id
             </div>
@@ -59,7 +58,7 @@
               <div>
                 <span class="muted">@commit.parents.size parents
                 @commit.parents.map { parent =>
-                  <a href="@url(repository)/commit/@parent" class="commit-id">@parent.substring(0, 7)</a>
+                  <a href="@helpers.url(repository)/commit/@parent" class="commit-id">@parent.substring(0, 7)</a>
                 }.mkHtml(" + ")
                 </span>
               </div>
@@ -68,29 +67,29 @@
 
           <div class="author-info">
             <div class="author">
-              @avatar(commit, 20)
-              <span>@user(commit.authorName, commit.authorEmailAddress, "username strong")</span>
-              <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+              @helpers.avatar(commit, 20)
+              <span>@helpers.user(commit.authorName, commit.authorEmailAddress, "username strong")</span>
+              <span class="muted">authored @gitbucket.core.helper.html.datetimeago(commit.authorTime)</span>
             </div>
             @if(commit.isDifferentFromAuthor) {
             <div class="committer">
               <span class="octicon octicon-arrow-right"></span>
-              <span>@user(commit.committerName, commit.committerEmailAddress, "username strong")</span>
-              <span class="muted"> committed @helper.html.datetimeago(commit.commitTime)</span>
+              <span>@helpers.user(commit.committerName, commit.committerEmailAddress, "username strong")</span>
+              <span class="muted"> committed @gitbucket.core.helper.html.datetimeago(commit.commitTime)</span>
             </div>
             }
           </div>
         </td>
       </tr>
     </table>
-    @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true, None, hasWritePermission, true)
+    @gitbucket.core.helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true, None, hasWritePermission, true)
     <label class="checkbox">
       <input type="checkbox" id="show-notes"> Show line notes below
     </label>
     <div id="comment-list">
-      @issues.html.commentlist(None, comments, hasWritePermission, repository, None)
+      @gitbucket.core.issues.html.commentlist(None, comments, hasWritePermission, repository, None)
     </div>
-    @commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
+    @gitbucket.core.repo.html.commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
   }
 }
 <script>
diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html
index 08e2e5e..459e1f4 100644
--- a/src/main/twirl/gitbucket/core/repo/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html
@@ -5,30 +5,29 @@
   page: Int,
   hasNext: Boolean,
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
     <div class="head">
       @if(pathList.isEmpty){
-        @helper.html.branchcontrol(
+        @gitbucket.core.helper.html.branchcontrol(
           branch,
           repository,
           hasWritePermission
         ){
           @repository.branchList.map { x =>
-            <li><a href="@url(repository)/commits/@encodeRefName(x)">@helper.html.checkicon(x == branch) @x</a></li>
+            <li><a href="@helpers.url(repository)/commits/@helpers.encodeRefName(x)">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
           }
         }
       }
       @if(pathList.nonEmpty){
         <span class="muted">History for</span>
-        <a class="strong" href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        <a class="strong" href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
           @if(i == pathList.length - 1){
             <span class="strong">@section</span>
           } else {
-            <a class="strong" href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+            <a class="strong" href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
           }
         }
       }
@@ -37,33 +36,33 @@
     <table class="table table-bordered">
     @commits.map { day =>
       <tr>
-        <th rowspan="@day.size" width="100">@date(day.head.commitTime)</th>
+        <th rowspan="@day.size" width="100">@helpers.date(day.head.commitTime)</th>
         @day.zipWithIndex.map { case (commit, i) =>
           @if(i != 0){ <tr> }
           <td>
             <div class="pull-right text-right">
-              <a href="@url(repository)/commit/@commit.id" class="monospace commit-message strong"><i class="octicon octicon-diff" style="color: black;"></i>@commit.id.substring(0, 7)</a><br>
-              <a href="@url(repository)/tree/@commit.id" class="button-link">Browse files »</a>
+              <a href="@helpers.url(repository)/commit/@commit.id" class="monospace commit-message strong"><i class="octicon octicon-diff" style="color: black;"></i>@commit.id.substring(0, 7)</a><br>
+              <a href="@helpers.url(repository)/tree/@commit.id" class="button-link">Browse files »</a>
             </div>
             <div>
-              <div class="commit-avatar-image">@avatarLink(commit, 40)</div>
+              <div class="commit-avatar-image">@helpers.avatarLink(commit, 40)</div>
               <div>
-                @link(commit.summary, repository)
+                @helpers.link(commit.summary, repository)
                 @if(commit.description.isDefined){
                   <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
                 }
                 <br>
                 @if(commit.description.isDefined){
-                  <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+                  <pre id="description-@commit.id" style="display: none;" class="commit-description">@helpers.link(commit.description.get, repository)</pre>
                 }
                   <div>
                   @if(commit.isDifferentFromAuthor) {
-                    @user(commit.authorName, commit.authorEmailAddress, "username")
-                    <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+                    @helpers.user(commit.authorName, commit.authorEmailAddress, "username")
+                    <span class="muted">authored @gitbucket.core.helper.html.datetimeago(commit.authorTime)</span>
                     <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
                   }
-                  @user(commit.committerName, commit.committerEmailAddress, "username")
-                  <span class="muted">committed @helper.html.datetimeago(commit.commitTime)</span>
+                  @helpers.user(commit.committerName, commit.committerEmailAddress, "username")
+                  <span class="muted">committed @gitbucket.core.helper.html.datetimeago(commit.commitTime)</span>
                 </div>
               </div>
             </div>
diff --git a/src/main/twirl/gitbucket/core/repo/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html
index 5d38e81..57190ab 100644
--- a/src/main/twirl/gitbucket/core/repo/delete.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html
@@ -3,15 +3,14 @@
   pathList: List[String],
   fileName: String,
   content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository){
-    <form method="POST" action="@url(repository)/remove" validate="true">
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"Deleting ${context.path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
+    <form method="POST" action="@helpers.url(repository)/remove" validate="true">
       <div class="head">
-        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
-          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
         @fileName
         <input type="hidden" name="fileName" id="fileName" value="@fileName"/>
@@ -22,7 +21,7 @@
         <th style="font-weight: normal;" class="box-header">
           @fileName
           <div class="pull-right align-right">
-            <a href="@url(repository)/blob/@branch/@{(pathList ::: List(fileName)).mkString("/")}" class="btn btn-small">View</a>
+            <a href="@helpers.url(repository)/blob/@branch/@{(pathList ::: List(fileName)).mkString("/")}" class="btn btn-small">View</a>
           </div>
         </th>
         <tr>
@@ -33,7 +32,7 @@
           </td>
         </tr>
       </table>
-      <div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div>
+      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
         <div class="box issue-comment-box">
         <div class="box-content">
           <div>
@@ -43,7 +42,7 @@
             <input type="text" name="message" style="width: 98%;"/>
           </div>
           <div style="text-align: right;">
-            <a href="@url(repository)/blob/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-danger">Cancel</a>
+            <a href="@helpers.url(repository)/blob/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-danger">Cancel</a>
             <input type="submit" id="commit" class="btn btn-success" value="Commit changes"/>
           </div>
         </div>
@@ -51,8 +50,8 @@
     </form>
   }
 }
-<script type="text/javascript" src="@assets/vendors/jsdifflib/difflib.js"></script>
-<link href="@assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script type="text/javascript" src="@helpers.assets/vendors/jsdifflib/difflib.js"></script>
+<link href="@helpers.assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
 <script>
 $(function(){
   diffUsingJS('oldText', 'newText', 'diffText', 1);
diff --git a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
index 4961c27..fdc8662 100644
--- a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
@@ -1,5 +1,4 @@
 @(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
-@import context.path
 <span class="error-edit-content-@commentId error"></span>
 @gitbucket.core.helper.html.attached(owner, repository, Seq("emoji", "user")){
   <textarea style="height: 100px;" id="edit-content-@commentId" class="form-control">@content</textarea>
@@ -22,7 +21,7 @@
     $box = $(this).closest('.commit-comment-box');
     $('.update-comment-@commentId, .cancel-comment-@commentId', $box).attr('disabled', 'disabled');
     $.ajax({
-      url: '@path/@owner/@repository/commit_comments/edit/@commentId',
+      url: '@context.path/@owner/@repository/commit_comments/edit/@commentId',
       type: 'POST',
       data: {
         content : $('#edit-content-@commentId', $box).val()
@@ -38,7 +37,7 @@
   $(document).on('click', '.cancel-comment-@commentId', function(){
     $box = $(this).closest('.box');
     $('.update-comment-@commentId, .cancel-comment-@commentId', $box).attr('disabled', 'disabled');
-    $.get('@path/@owner/@repository/commit_comments/_data/@commentId', curriedCallback($box));
+    $.get('@context.path/@owner/@repository/commit_comments/_data/@commentId', curriedCallback($box));
     return false;
   });
 });
diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html
index be832df..5cfe95b 100644
--- a/src/main/twirl/gitbucket/core/repo/editor.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -4,19 +4,18 @@
   fileName: Option[String],
   content: gitbucket.core.util.JGitUtil.ContentInfo,
   protectedBranch: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
     @if(protectedBranch){
       <div class="alert alert-danger">branch @branch is protected.</div>
     }
-    <form method="POST" action="@url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
+    <form method="POST" action="@helpers.url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
       <span class="error" id="error-newFileName"></span>
       <div class="head">
-        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
-          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
         <input type="text" name="newFileName" id="newFileName" class="form-control" placeholder="Name your file..." value="@fileName"/>
         <input type="hidden" name="oldFileName" id="oldFileName" value="@fileName"/>
@@ -47,7 +46,7 @@
           </td>
         </tr>
       </table>
-      <div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div>
+      <div class="issue-avatar-image">@helpers.avatarLink(context.loginAccount.get.userName, 48)</div>
       <div class="panel panel-default issue-comment-box">
         <div class="panel-body">
           <div>
@@ -58,9 +57,9 @@
           </div>
           <div style="text-align: right;">
             @if(fileName.isEmpty){
-              <a href="@url(repository)/tree/@encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-danger">Cancel</a>
+              <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-danger">Cancel</a>
             } else {
-              <a href="@url(repository)/blob/@encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-danger">Cancel</a>
+              <a href="@helpers.url(repository)/blob/@helpers.encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-danger">Cancel</a>
             }
             <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
             <input type="hidden" id="charset" name="charset" value="@content.charset"/>
@@ -73,9 +72,9 @@
     </form>
   }
 }
-<script src="@assets/vendors/ace/ace.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="@assets/vendors/jsdifflib/difflib.js"></script>
-<link href="@assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script src="@helpers.assets/vendors/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="@helpers.assets/vendors/jsdifflib/difflib.js"></script>
+<link href="@helpers.assets/vendors/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
 <script>
 $(function(){
   $('#editor').text($('#initial').val());
@@ -84,7 +83,7 @@
   //editor.getSession().setUseWrapMode(false);
 
   @if(fileName.isDefined){
-    editor.getSession().setMode("ace/mode/@editorType(fileName.get)");
+    editor.getSession().setMode("ace/mode/@helpers.editorType(fileName.get)");
   }
   @if(protectedBranch){
     editor.setReadOnly(true);
@@ -131,10 +130,10 @@
     $('#btn-code').removeClass('active');
     $('#btn-preview').addClass('active');
 
-    @if(fileName.map(isRenderable _).getOrElse(false)) {
+    @if(fileName.map(helpers.isRenderable _).getOrElse(false)) {
       // update preview
-      $('#preview').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
-      $.post('@url(repository)/_preview', {
+      $('#preview').html('<img src="@helpers.assets/common/images/indicator.gif"> Previewing...');
+      $.post('@helpers.url(repository)/_preview', {
         content          : editor.getValue(),
         enableWikiLink   : false,
         enableRefsLink   : false,
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index 7e53be5..6df6409 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -8,39 +8,38 @@
   branchPullRequest: Option[(gitbucket.core.model.PullRequest, gitbucket.core.model.Issue)],
   info: Option[Any] = None,
   error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.service.RepositoryService._
-@html.main(
+@import gitbucket.core.view.helpers
+@import gitbucket.core.service.RepositoryService
+@gitbucket.core.html.main(
   if(pathList.isEmpty){
     if(branch == repository.repository.defaultBranch){
       s"${repository.owner}/${repository.name}"
     } else {
-      s"${repository.owner}/${repository.name} at ${encodeRefName(branch)}"
+      s"${repository.owner}/${repository.name} at ${helpers.encodeRefName(branch)}"
     }
   } else {
-    s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}"
+    s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}"
   }, Some(repository)) {
-  @html.menu("files", repository, Some(branch), info, error){
+  @gitbucket.core.html.menu("files", repository, Some(branch), info, error){
     <div class="head">
       <div class="pull-right pc">
         <div class="btn-group">
-          <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default pc" data-hotkey="t"><i class="octicon octicon-search"></i></a>
-          <a href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default"><i class="octicon octicon-history"></i></a>
+          <a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default pc" data-hotkey="t"><i class="octicon octicon-search"></i></a>
+          <a href="@helpers.url(repository)/commits/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default"><i class="octicon octicon-history"></i></a>
         </div>
       </div>
       @if(pathList.isEmpty){
-        @if(platform != "linux" && platform != null){
+        @if(context.platform != "linux" && context.platform != null){
           <div class="pull-right pc" style="margin-right: 5px;">
             <div class="btn-group">
-              <a href="@openRepoUrl(repository.httpUrl)" id="repository-clone-url" class="btn btn-sm btn-default"><i class="octicon octicon-desktop-download"></i></a>
-              <a href="@{url(repository)}/archive/@{encodeRefName(branch)}.zip" class="btn btn-sm btn-default"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
+              <a href="@RepositoryService.openRepoUrl(repository.httpUrl)" id="repository-clone-url" class="btn btn-sm btn-default"><i class="octicon octicon-desktop-download"></i></a>
+              <a href="@{helpers.url(repository)}/archive/@{helpers.encodeRefName(branch)}.zip" class="btn btn-sm btn-default"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
             </div>
           </div>
         }
         <div class="pull-right pc">
           <div style="width: 240px; margin-right: 5px; margin-left: 5px;">
-            @helper.html.copy("repository-url-copy", repository.httpUrl){
+            @gitbucket.core.helper.html.copy("repository-url-copy", repository.httpUrl){
               @if(repository.sshUrl.isDefined){
                 <div class="btn-group input-group-btn">
                   <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -67,9 +66,9 @@
           </div>
         </div>
       }
-      @helper.html.branchcontrol(branch, repository, hasWritePermission){
+      @gitbucket.core.helper.html.branchcontrol(branch, repository, hasWritePermission){
         @repository.branchList.map { x =>
-          <li><a href="@url(repository)/tree/@encodeRefName(x)">@helper.html.checkicon(x == branch) @x</a></li>
+          <li><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(x)">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
         }
       }
       @if(pathList.isEmpty){
@@ -81,12 +80,12 @@
         }
         *@
       } else {
-        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
-          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
       }
-      <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file here" @if(!hasWritePermission){disabled}><i class="octicon octicon-plus"></i></a>
+      <a href="@helpers.url(repository)/new/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file here" @if(!hasWritePermission){disabled}><i class="octicon octicon-plus"></i></a>
     </div>
     <table class="table table-hover">
       @*
@@ -104,19 +103,19 @@
         <th colspan="4" class="latest-commit">
           <div>
             <div class="pull-right align-right monospace" style="line-height: 18px;">
-              <a href="@url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
+              <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
             </div>
             <div class="author-info">
               <div class="author">
-                @avatar(latestCommit, 20)
-                <span>@user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")</span>
-                <span class="muted"> authored @helper.html.datetimeago(latestCommit.authorTime)</span>
+                @helpers.avatar(latestCommit, 20)
+                <span>@helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")</span>
+                <span class="muted"> authored @gitbucket.core.helper.html.datetimeago(latestCommit.authorTime)</span>
               </div>
               @if(latestCommit.isDifferentFromAuthor) {
               <div class="committer">
                 <span class="octicon octicon-arrow-right"></span>
-                <span>@user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong")</span>
-                <span class="muted"> committed @helper.html.datetimeago(latestCommit.commitTime)</span>
+                <span>@helpers.user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong")</span>
+                <span class="muted"> committed @gitbucket.core.helper.html.datetimeago(latestCommit.commitTime)</span>
               </div>
               }
             </div>
@@ -126,7 +125,7 @@
       @if(pathList.size > 0){
       <tr>
         <td width="16" class="file-icon"></td>
-        <td><a href="@url(repository)@if(pathList.size > 1){/tree/@encodeRefName(branch)/@pathList.init.mkString("/")}">..</a></td>
+        <td><a href="@helpers.url(repository)@if(pathList.size > 1){/tree/@helpers.encodeRefName(branch)/@pathList.init.mkString("/")}">..</a></td>
         <td></td>
         <td></td>
       </tr>
@@ -154,7 +153,7 @@
                 }</span>@file.name.split("/").toList.last
               </a>
             } else {
-              <a href="@url(repository)/tree@{(branch :: pathList).map(encodeRefName).mkString("/", "/", "/")}@{encodeRefName(file.name)}">
+              <a href="@helpers.url(repository)/tree@{(branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/")}@{helpers.encodeRefName(file.name)}">
                 <span class="simplified-path">@file.name.split("/").toList.init match {
                   case Nil => {}
                   case list => {@list.mkString("", "/", "/")}
@@ -162,20 +161,20 @@
               </a>
             }
           } else {
-            <a href="@url(repository)/blob@{(branch :: pathList).map(encodeRefName).mkString("/", "/", "/")}@{encodeRefName(file.name)}">@file.name</a>
+            <a href="@helpers.url(repository)/blob@{(branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/")}@{helpers.encodeRefName(file.name)}">@file.name</a>
           }
         </td>
         <td class="mute">
-          <a href="@url(repository)/commit/@file.commitId" class="commit-message shorten-text" title="@file.message">@link(file.message, repository)</a>
+          <a href="@helpers.url(repository)/commit/@file.commitId" class="commit-message shorten-text" title="@file.message">@helpers.link(file.message, repository)</a>
         </td>
-        <td style="text-align: right;">@helper.html.datetimeago(file.time, false)</td>
+        <td style="text-align: right;">@gitbucket.core.helper.html.datetimeago(file.time, false)</td>
       </tr>
       }
     </table>
     @readme.map { case(filePath, content) =>
       <div id="readme" class="panel panel-default">
         <div class="panel-heading strong">@filePath.reverse.head</div>
-        <div class="panel-body markdown-body" style="padding-left: 20px; padding-right: 20px;">@renderMarkup(filePath, content, branch, repository, false, false, true)</div>
+        <div class="panel-body markdown-body" style="padding-left: 20px; padding-right: 20px;">@helpers.renderMarkup(filePath, content, branch, repository, false, false, true)</div>
       </div>
     }
   }
@@ -185,14 +184,14 @@
   $('#repository-url-http').click(function(){
     $('#repository-url-proto').text('HTTP');
     $('#repository-url').val('@repository.httpUrl');
-    $('#repository-clone-url').attr('href', '@openRepoUrl(repository.httpUrl)')
+    $('#repository-clone-url').attr('href', '@RepositoryService.openRepoUrl(repository.httpUrl)')
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
 
   $('#repository-url-ssh').click(function(){
     $('#repository-url-proto').text('SSH');
     $('#repository-url').val('@sshUrl');
-    $('#repository-clone-url').attr('href', '@openRepoUrl(sshUrl)');
+    $('#repository-clone-url').attr('href', '@RepositoryService.openRepoUrl(sshUrl)');
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
 }
diff --git a/src/main/twirl/gitbucket/core/repo/find.scala.html b/src/main/twirl/gitbucket/core/repo/find.scala.html
index 14d86bf..1cf149c 100644
--- a/src/main/twirl/gitbucket/core/repo/find.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/find.scala.html
@@ -2,14 +2,13 @@
   treeId: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo
   )(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository, Some(branch)){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository, Some(branch)){
 
 <div>
   <div class="find-input">
-    <span class="bold"><a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a></span>
+    <span class="bold"><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a></span>
     /
     <input type="text" name="query" autocomplete="off" spellcheck="false" autofocus id="tree-finder-field" />
   </div>
@@ -23,13 +22,13 @@
   <code>↓</code> to navigate,
   <code>enter</code> to view files.
 </div>
-<table id="tree-finder-results" class="table table-file-list" data-url="@url(repository)/tree-list/@treeId">
+<table id="tree-finder-results" class="table table-file-list" data-url="@helpers.url(repository)/tree-list/@treeId">
   <tbody class="tree-browser-result-template">
     <tr class="tree-browser-result">
       <td class="icon"><span class="octicon octicon-chevron-right"></span></td>
       <td class="icon"><i class="octicon octicon-file-text"></i></td>
       <td>
-        <a href="@url(repository)/blob/@encodeRefName(branch)"></a>
+        <a href="@helpers.url(repository)/blob/@helpers.encodeRefName(branch)"></a>
       </td>
     </tr>
   </tbody>
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html
index 60c45c5..22eb0cd 100644
--- a/src/main/twirl/gitbucket/core/repo/forked.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html
@@ -2,35 +2,34 @@
   members: List[(String, String)],
   groupNames: List[String],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("fork", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("fork", repository){
     <h1 class="body-title">
       Forked repositories
-      @if(loginAccount.isEmpty){
-        <a href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
+      @if(context.loginAccount.isEmpty){
+        <a href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
       } else {
         @if(groupNames.isEmpty) {
           <a id="fork-link" href="javascript:void(0);" class="btn btn-success">Fork</a>
         } else {
-          <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
+          <a href="@context.path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
         }
       }
     </h1>
-    @if(loginAccount.isDefined && groupNames.isEmpty){
-      <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
-        <input type="hidden" name="account" value="@loginAccount.get.userName"/>
+    @if(context.loginAccount.isDefined && groupNames.isEmpty){
+      <form id="fork-form" method="post" action="@context.path/@repository.owner/@repository.name/fork" style="display: none;">
+        <input type="hidden" name="account" value="@context.loginAccount.get.userName"/>
       </form>
     }
     <div class="block">
       @if(originRepository.isDefined){
-        @avatar(originRepository.get.owner, 20)
+        @helpers.avatar(originRepository.get.owner, 20)
         <span@if(repository.owner == originRepository.get.owner){ class="highlight"}>
-          <a href="@url(originRepository.get.owner)">@originRepository.get.owner</a> / <a href="@path/@originRepository.get.owner/@originRepository.get.name">@originRepository.get.name</a>
+          <a href="@helpers.url(originRepository.get.owner)">@originRepository.get.owner</a> / <a href="@context.path/@originRepository.get.owner/@originRepository.get.name">@originRepository.get.name</a>
         </span>
       } else {
-        @avatar(repository.repository.originUserName.get, 20)
+        @helpers.avatar(repository.repository.originUserName.get, 20)
         <span class="highlight">
           @repository.repository.originUserName / @repository.repository.originRepositoryName
         </span>
@@ -39,9 +38,9 @@
     </div>
     @members.map { case (owner, name) =>
       <div class="block">
-        @avatar(owner, 20)
+        @helpers.avatar(owner, 20)
         <span@if(repository.owner == owner){ class="highlight"}>
-          <a href="@url(owner)">@owner</a> / <a href="@path/@owner/@name">@name</a>
+          <a href="@helpers.url(owner)">@owner</a> / <a href="@context.path/@owner/@name">@name</a>
         </span>
       </div>
     }
@@ -50,8 +49,8 @@
 <script>
 $(function(){
   $('a[rel*=facebox]').facebox({
-    'loadingImage': '@assets/vendors/facebox/loading.gif',
-    'closeImage': '@assets/vendors/facebox/closelabel.png'
+    'loadingImage': '@helpers.assets/vendors/facebox/loading.gif',
+    'closeImage': '@helpers.assets/vendors/facebox/closelabel.png'
   });
 
   $(document).on("click", ".js-fork-owner-select-target", function() {
@@ -62,7 +61,7 @@
     }
   });
 
-  @if(loginAccount.isDefined){
+  @if(context.loginAccount.isDefined){
   $(document).on("click", "a#fork-link", function(e) {
     e.preventDefault();
     $('#fork-form').submit();
diff --git a/src/main/twirl/gitbucket/core/repo/guide.scala.html b/src/main/twirl/gitbucket/core/repo/guide.scala.html
index d4670f3..3c9e62c 100644
--- a/src/main/twirl/gitbucket/core/repo/guide.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/guide.scala.html
@@ -1,10 +1,8 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.service.SystemSettingsService
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("files", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("files", repository){
     @if(!hasWritePermission){
       <h3>This is an empty repository</h3>
     } else {
@@ -17,7 +15,7 @@
       }
       </div>
       <h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
-      @pre {
+      @helpers.pre {
         touch README.md
         git init
         git add README.md
@@ -26,7 +24,7 @@
         git push -u origin master
       }
       <h3 style="margin-top: 30px;">Push an existing repository from the command line</h3>
-      @pre {
+      @helpers.pre {
         git remote add origin <span class="live-clone-url">@repository.httpUrl</span>
         git push -u origin master
       }
diff --git a/src/main/twirl/gitbucket/core/repo/tags.scala.html b/src/main/twirl/gitbucket/core/repo/tags.scala.html
index 54368e7..a8b9276 100644
--- a/src/main/twirl/gitbucket/core/repo/tags.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/tags.scala.html
@@ -1,8 +1,7 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("tags", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+  @gitbucket.core.html.menu("tags", repository){
     <table class="table table-bordered">
       <thead>
         <tr>
@@ -15,12 +14,12 @@
       <tbody>
         @repository.tags.reverse.map { tag =>
           <tr>
-            <td><a href="@url(repository)/tree/@encodeRefName(tag.name)">@tag.name</a></td>
-            <td>@helper.html.datetimeago(tag.time, false)</td>
-            <td class="monospace"><a href="@url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
+            <td><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(tag.name)">@tag.name</a></td>
+            <td>@gitbucket.core.helper.html.datetimeago(tag.time, false)</td>
+            <td class="monospace"><a href="@helpers.url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
             <td>
-                <a href="@url(repository)/archive/@{encodeRefName(tag.name)}.zip">ZIP</a>
-                <a href="@url(repository)/archive/@{encodeRefName(tag.name)}.tar.gz">TAR.GZ</a>
+                <a href="@helpers.url(repository)/archive/@{helpers.encodeRefName(tag.name)}.zip">ZIP</a>
+                <a href="@helpers.url(repository)/archive/@{helpers.encodeRefName(tag.name)}.tar.gz">TAR.GZ</a>
             </td>
           </tr>
         }
diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
index 3dadb7a..0b6293c 100644
--- a/src/main/twirl/gitbucket/core/search/code.scala.html
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -4,24 +4,23 @@
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.service.RepositorySearchService._
-@html.main("Search Results", Some(repository)){
-  @menu("code", files.size, issueCount, wikiCount, query, repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.service.RepositorySearchService
+@gitbucket.core.html.main("Search Results", Some(repository)){
+  @gitbucket.core.search.html.menu("code", files.size, issueCount, wikiCount, query, repository){
     @if(files.isEmpty){
       <h4>We couldn't find any code matching '@query'</h4>
     } else {
-      <h4>We've found @files.size code @plural(files.size, "result")</h4>
+      <h4>We've found @files.size code @helpers.plural(files.size, "result")</h4>
     }
-    @files.drop((page - 1) * CodeLimit).take(CodeLimit).map { file =>
+    @files.drop((page - 1) * RepositorySearchService.CodeLimit).take(RepositorySearchService.CodeLimit).map { file =>
       <div>
-        <h5><a href="@url(repository)/blob/@repository.repository.defaultBranch/@file.path">@file.path</a></h5>
-        <div class="small muted">Last committed @helper.html.datetimeago(file.lastModified)</div>
+        <h5><a href="@helpers.url(repository)/blob/@repository.repository.defaultBranch/@file.path">@file.path</a></h5>
+        <div class="small muted">Last committed @gitbucket.core.helper.html.datetimeago(file.lastModified)</div>
         <pre class="prettyprint linenums:@file.highlightLineNumber" style="padding-left: 25px;">@Html(file.highlightText)</pre>
       </div>
     }
-    @helper.html.paginator(page, files.size, CodeLimit, 10,
-      s"${url(repository)}/search?q=${urlEncode(query)}&type=code")
+    @gitbucket.core.helper.html.paginator(page, files.size, RepositorySearchService.CodeLimit, 10,
+      s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=code")
   }
 }
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/search/issues.scala.html b/src/main/twirl/gitbucket/core/search/issues.scala.html
index 8e5b3ca..06e05c3 100644
--- a/src/main/twirl/gitbucket/core/search/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/search/issues.scala.html
@@ -4,34 +4,33 @@
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.service.RepositorySearchService._
-@html.main("Search Results", Some(repository)){
-  @menu("issue", fileCount, issues.size, wikiCount, query, repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.service.RepositorySearchService
+@gitbucket.core.html.main("Search Results", Some(repository)){
+  @gitbucket.core.search.html.menu("issue", fileCount, issues.size, wikiCount, query, repository){
     @if(issues.isEmpty){
       <h4>We couldn't find any code matching '@query'</h4>
     } else {
-      <h4>We've found @issues.size code @plural(issues.size, "result")</h4>
+      <h4>We've found @issues.size code @helpers.plural(issues.size, "result")</h4>
     }
-    @issues.drop((page - 1) * IssueLimit).take(IssueLimit).map { issue =>
+    @issues.drop((page - 1) * RepositorySearchService.IssueLimit).take(RepositorySearchService.IssueLimit).map { issue =>
       <div class="block">
         <div class="pull-right muted">#@issue.issueId</div>
-        <h4 style="margin-top: 0px;"><a href="@url(repository)/@if(issue.isPullRequest){pull} else {issues}/@issue.issueId">@issue.title</a></h4>
+        <h4 style="margin-top: 0px;"><a href="@helpers.url(repository)/@if(issue.isPullRequest){pull} else {issues}/@issue.issueId">@issue.title</a></h4>
         @if(issue.highlightText.nonEmpty){
           <pre>@Html(issue.highlightText)</pre>
         }
         <div class="small muted">
-          Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a>
-          @helper.html.datetimeago(issue.registeredDate)
+          Opened by <a href="@helpers.url(issue.openedUserName)" class="username">@issue.openedUserName</a>
+          @gitbucket.core.helper.html.datetimeago(issue.registeredDate)
           @if(issue.commentCount > 0){
             &nbsp;&nbsp;<i class="octicon octicon-comment"></i>
-            <span class="strong">@issue.commentCount</span> @plural(issue.commentCount, "comment")
+            <span class="strong">@issue.commentCount</span> @helpers.plural(issue.commentCount, "comment")
           }
         </div>
       </div>
     }
-    @helper.html.paginator(page, issues.size, IssueLimit, 10,
-      s"${url(repository)}/search?q=${urlEncode(query)}&type=issue")
+    @gitbucket.core.helper.html.paginator(page, issues.size, RepositorySearchService.IssueLimit, 10,
+      s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=issue")
   }
 }
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
index 6f085b7..5a946ab 100644
--- a/src/main/twirl/gitbucket/core/search/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -1,11 +1,10 @@
 @(active: String, fileCount: Int, issueCount: Int, wikiCount: Int, query: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.menu("", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.menu("", repository){
   <ul class="nav nav-tabs" style="margin-bottom: 20px;">
     <li@if(active=="code"){ class="active"}>
-      <a href="@url(repository)/search?q=@urlEncode(query)&type=code">
+      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=code">
         Files
         @if(fileCount != 0){
           <span class="badge">@fileCount</span>
@@ -13,7 +12,7 @@
       </a>
     </li>
     <li@if(active=="issue"){ class="active"}>
-      <a href="@url(repository)/search?q=@urlEncode(query)&type=issue">
+      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=issue">
         Issues
         @if(issueCount != 0){
           <span class="badge">@issueCount</span>
@@ -21,7 +20,7 @@
       </a>
     </li>
     <li@if(active=="wiki"){ class="active"}>
-      <a href="@url(repository)/search?q=@urlEncode(query)&type=wiki">
+      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=wiki">
         Wiki
         @if(wikiCount != 0){
           <span class="badge">@wikiCount</span>
@@ -29,7 +28,7 @@
       </a>
     </li>
   </ul>
-  <form action="@url(repository)/search" method="GET" class="form-inline">
+  <form action="@helpers.url(repository)/search" method="GET" class="form-inline">
     <input type="text" name="q" value="@query" class="form-control" style="width: 400px; margin-bottom: 0px;"/>
     <input type="submit" value="Search" class="btn btn-default"/>
     <input type="hidden" name="type" value="@active"/>
diff --git a/src/main/twirl/gitbucket/core/search/wiki.scala.html b/src/main/twirl/gitbucket/core/search/wiki.scala.html
index de718e6..e423b44 100644
--- a/src/main/twirl/gitbucket/core/search/wiki.scala.html
+++ b/src/main/twirl/gitbucket/core/search/wiki.scala.html
@@ -4,24 +4,23 @@
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.service.RepositorySearchService._
-@html.main("Search Results", Some(repository)){
-  @menu("wiki", fileCount, issueCount, wikis.size, query, repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.service.RepositorySearchService
+@gitbucket.core.html.main("Search Results", Some(repository)){
+  @gitbucket.core.search.html.menu("wiki", fileCount, issueCount, wikis.size, query, repository){
     @if(wikis.isEmpty){
       <h4>We couldn't find any code matching '@query'</h4>
     } else {
-      <h4>We've found @wikis.size code @plural(wikis.size, "result")</h4>
+      <h4>We've found @wikis.size code @helpers.plural(wikis.size, "result")</h4>
     }
-    @wikis.drop((page - 1) * CodeLimit).take(CodeLimit).map { file =>
+    @wikis.drop((page - 1) * RepositorySearchService.CodeLimit).take(RepositorySearchService.CodeLimit).map { file =>
       <div>
-        <h5><a href="@url(repository)/wiki/@file.path">@file.path</a></h5>
-        <div class="small muted">Last committed @helper.html.datetimeago(file.lastModified)</div>
+        <h5><a href="@helpers.url(repository)/wiki/@file.path">@file.path</a></h5>
+        <div class="small muted">Last committed @gitbucket.core.helper.html.datetimeago(file.lastModified)</div>
         <pre class="prettyprint linenums:@file.highlightLineNumber" style="padding-left: 25px;">@Html(file.highlightText)</pre>
       </div>
     }
-    @helper.html.paginator(page, wikis.size, CodeLimit, 10,
-      s"${url(repository)}/search?q=${urlEncode(query)}&type=wiki")
+    @gitbucket.core.helper.html.paginator(page, wikis.size, RepositorySearchService.CodeLimit, 10,
+      s"${helpers.url(repository)}/search?q=${helpers.urlEncode(query)}&type=wiki")
   }
 }
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html
index 17c88ad..15a1ffb 100644
--- a/src/main/twirl/gitbucket/core/settings/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html
@@ -1,12 +1,10 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   protectedBranchList: Seq[String],
   info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.model.WebHook._
-@html.main("Branches", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("branches", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Branches", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("branches", repository){
       @if(repository.branchList.isEmpty){
         <div class="well">
           <center>
@@ -16,12 +14,12 @@
           </center>
         </div>
       } else {
-        @helper.html.information(info)
+        @gitbucket.core.helper.html.information(info)
         <div class="panel panel-default">
           <div class="panel-heading strong">Default branch</div>
           <div class="panel-body">
             <p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p>
-            <form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline">
+            <form id="form" method="post" action="@helpers.url(repository)/settings/update_default_branch" validate="true" class="form-inline">
               <span class="error" id="error-defaultBranch"></span>
               <select name="defaultBranch" id="defaultBranch" class="form-control">
                 @repository.branchList.map { branch =>
@@ -41,7 +39,7 @@
                 <select name="protectBranch" id="protectBranch" onchange="location=$(this).val()" class="form-control">
                   <option>Choose a branch...</option>
                   @repository.branchList.map { branch =>
-                    <option value="@url(repository)/settings/branches/@encodeRefName(branch)">@branch</option>
+                    <option value="@helpers.url(repository)/settings/branches/@helpers.encodeRefName(branch)">@branch</option>
                   }
                 </select>
                 <span class="error" id="error-protectBranch"></span>
@@ -54,7 +52,7 @@
                   <td>
                     <span class="branch-name">@branch</span>
                     <span class="branch-action">
-                      <a href="@url(repository)/settings/branches/@encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
+                      <a href="@helpers.url(repository)/settings/branches/@helpers.encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
                     </span>
                   </td>
                 </tr>
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index 4740ac7..877ee5f 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -3,14 +3,12 @@
   protection: gitbucket.core.api.ApiBranchProtection,
   knownContexts: Seq[String],
   info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.model.WebHook._
+@import gitbucket.core.view.helpers
 @check(bool:Boolean)={@if(bool){ checked}}
-@html.main(s"Branch protection for ${branch}", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("branches", repository){
-      @helper.html.information(info)
+@gitbucket.core.html.main(s"Branch protection for ${branch}", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("branches", repository){
+      @gitbucket.core.helper.html.information(info)
       <div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div>
       <form name="branchProtection" onsubmit="submitForm(event)">
         <div class="panel panel-default">
@@ -112,7 +110,7 @@
   var protection = getValue();
   $.ajax({
     method:'PATCH',
-    url:'@path/api/v3/repos/@repository.owner/@repository.name/branches/@encodeRefName(branch)',
+    url:'@context.path/api/v3/repos/@repository.owner/@repository.name/branches/@helpers.encodeRefName(branch)',
     contentType: 'application/json',
     dataType: 'json',
     data:JSON.stringify({protection:protection}),
diff --git a/src/main/twirl/gitbucket/core/settings/collaborators.scala.html b/src/main/twirl/gitbucket/core/settings/collaborators.scala.html
index 5bfc32b..21c8423 100644
--- a/src/main/twirl/gitbucket/core/settings/collaborators.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/collaborators.scala.html
@@ -1,18 +1,17 @@
 @(collaborators: List[String],
   isGroupRepository: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main("Settings", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("collaborators", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Settings", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("collaborators", repository){
       <h3>Manage Collaborators</h3>
       <ul class="collaborator">
         @collaborators.map { collaboratorName =>
           <li>
-            <a href="@url(collaboratorName)">@collaboratorName</a>
+            <a href="@helpers.url(collaboratorName)">@collaboratorName</a>
             @if(!isGroupRepository){
-              <a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
+              <a href="@helpers.url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
             } else {
               @if(repository.managers.contains(collaboratorName)){
                 (Manager)
@@ -22,11 +21,11 @@
         }
       </ul>
       @if(!isGroupRepository){
-        <form method="POST" action="@url(repository)/settings/collaborators/add" validate="true" autocomplete="off">
+        <form method="POST" action="@helpers.url(repository)/settings/collaborators/add" validate="true" autocomplete="off">
           <div>
             <span class="error" id="error-userName"></span>
           </div>
-          @helper.html.account("userName", 300)
+          @gitbucket.core.helper.html.account("userName", 300)
           <input type="submit" class="btn btn-default" value="Add"/>
         </form>
       }
diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html
index 42213ba..60b4007 100644
--- a/src/main/twirl/gitbucket/core/settings/danger.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html
@@ -1,20 +1,19 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main("Danger Zone", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("danger", repository){
-      @helper.html.information(info)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Danger Zone", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("danger", repository){
+      @gitbucket.core.helper.html.information(info)
       <div class="panel panel-default">
         <div class="panel-heading strong">Danger Zone</div>
         <div class="panel-body">
-          <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
+          <form id="transfer-form" method="post" action="@helpers.url(repository)/settings/transfer" validate="true" autocomplete="off">
             <fieldset class="form-group">
               <label class="strong">Transfer Ownership</label>
               <div>
                 Transfer this repo to another user or to group.
                 <div class="pull-right">
-                  @helper.html.account("newOwner", 200)
+                  @gitbucket.core.helper.html.account("newOwner", 200)
                   <input type="submit" class="btn btn-danger" value="Transfer"/>
                   <div>
                     <span id="error-newOwner" class="error"></span>
@@ -23,7 +22,7 @@
               </div>
             </fieldset>
           </form>
-          <form id="delete-form" method="post" action="@url(repository)/settings/delete">
+          <form id="delete-form" method="post" action="@helpers.url(repository)/settings/delete">
             <fieldset class="border-top form-group">
               <label class="strong">Delete repository</label>
               <div>
@@ -32,7 +31,7 @@
               </div>
             </fieldset>
           </form>
-          <form id="gc-form" method="post" action="@url(repository)/settings/gc">
+          <form id="gc-form" method="post" action="@helpers.url(repository)/settings/gc">
             <fieldset class="border-top form-group">
               <label class="strong">Garbage collection</label>
               <div>
diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
index 4253e12..2d069c7 100644
--- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
@@ -3,17 +3,16 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   info: Option[Any],
   create: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @import gitbucket.core.model.WebHook._
 @import gitbucket.core.model.WebHookContentType
-@check(name: String, event: Event)={
+@check(name: String, event: Event) = {
   name="@(name).@event.name" value="on" @if(events(event)){checked}
 }
-@html.main("Settings", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("hooks", repository){
-      @helper.html.information(info)
+@gitbucket.core.html.main("Settings", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("hooks", repository){
+      @gitbucket.core.helper.html.information(info)
       <div class="panel panel-default">
         <div class="panel-heading strong">Webhook / Manage webhook</div>
         <div class="panel-body">
@@ -72,12 +71,12 @@
             <label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label>
             <div class="text-right">
               @if(!create){
-                <input type="submit" class="btn btn-success" value="Update webhook" formaction="@url(repository)/settings/hooks/edit" />
-                <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
+                <input type="submit" class="btn btn-success" value="Update webhook" formaction="@helpers.url(repository)/settings/hooks/edit" />
+                <a href="@helpers.url(repository)/settings/hooks/delete?url=@helpers.urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
                   Delete webhook
                 </a>
               } else {
-                <input type="submit" class="btn btn-success" value="Add webhook" formaction="@url(repository)/settings/hooks/new" />
+                <input type="submit" class="btn btn-success" value="Add webhook" formaction="@helpers.url(repository)/settings/hooks/new" />
               }
             </div>
           </form>
@@ -146,7 +145,7 @@
     $("#test-modal-url").text(url)
     $("#test-report-modal").modal('show')
     $("#test-report").hide();
-    var targetUrl = '@url(repository)/settings/hooks/test?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
+    var targetUrl = '@helpers.url(repository)/settings/hooks/test?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
     if (token) {
       targetUrl = targetUrl + encodeURIComponent(token);
     }
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
index a82f2d6..718421f 100644
--- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -1,12 +1,11 @@
 @(webHooks: List[(gitbucket.core.model.WebHook, Set[gitbucket.core.model.WebHook.Event])],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main("Settings", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("hooks", repository){
-      @helper.html.information(info)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Settings", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("hooks", repository){
+      @gitbucket.core.helper.html.information(info)
       <div class="panel panel-default">
         <div class="panel-heading strong">
           Webhooks
@@ -17,21 +16,21 @@
             When the specified events happen, we’ll send a POST request to each of the URLs you provide.
             Learn more in <a href="https://github.com/takezoe/gitbucket/wiki/API-WebHook" target="_blank">GitBucket Wiki Webhook Page</a>.
           </p>
-          <a href="@url(repository)/settings/hooks/new" class="btn btn-success pull-right" style="margin-bottom: 10px;">Add webhook</a>
+          <a href="@helpers.url(repository)/settings/hooks/new" class="btn btn-success pull-right" style="margin-bottom: 10px;">Add webhook</a>
 
           <table class="table table-condensed" style="margin-bottom:0px;">
             @webHooks.map { case (webHook, events) =>
               <tr><td style="vertical-align: middle;">
-                <a href="@url(repository)/settings/hooks/edit?url=@urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
+                <a href="@helpers.url(repository)/settings/hooks/edit?url=@helpers.urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
                   <span class="css-truncate-target">@webHook.url</span>
                 </a>
                 <em class="css-truncate" style="max-width: 225px;">(<span class="css-truncate-target">@events.map(_.name).mkString(", ")</span>)</em>
               </td><td>
                 <div class="btn-group pull-right">
-                  <a href="@url(repository)/settings/hooks/edit?url=@urlEncode(webHook.url)" class="btn btn-default">
+                  <a href="@helpers.url(repository)/settings/hooks/edit?url=@helpers.urlEncode(webHook.url)" class="btn btn-default">
                     <span class="octicon octicon-pencil"></span>
                   </a>
-                  <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
+                  <a href="@helpers.url(repository)/settings/hooks/delete?url=@helpers.urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
                     <span class="octicon octicon-x"></span>
                   </a>
                 </div>
diff --git a/src/main/twirl/gitbucket/core/settings/menu.scala.html b/src/main/twirl/gitbucket/core/settings/menu.scala.html
index a8207dc..5a8895c 100644
--- a/src/main/twirl/gitbucket/core/settings/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/menu.scala.html
@@ -1,28 +1,27 @@
 @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 <ul class="nav nav-tabs" style="margin-bottom: 20px;">
   <li@if(active=="options"){ class="active"}>
-    <a href="@url(repository)/settings/options">Options</a>
+    <a href="@helpers.url(repository)/settings/options">Options</a>
   </li>
   <li@if(active=="collaborators"){ class="active"}>
-    <a href="@url(repository)/settings/collaborators">Collaborators</a>
+    <a href="@helpers.url(repository)/settings/collaborators">Collaborators</a>
   </li>
   @if(!repository.branchList.isEmpty){
   <li@if(active=="branches"){ class="active"}>
-    <a href="@url(repository)/settings/branches">Branches</a>
+    <a href="@helpers.url(repository)/settings/branches">Branches</a>
   </li>
   }
   <li@if(active=="hooks"){ class="active"}>
-    <a href="@url(repository)/settings/hooks">Service Hooks</a>
+    <a href="@helpers.url(repository)/settings/hooks">Service Hooks</a>
   </li>
   <li@if(active=="danger"){ class="active"}>
-    <a href="@url(repository)/settings/danger">Danger Zone</a>
+    <a href="@helpers.url(repository)/settings/danger">Danger Zone</a>
   </li>
   @gitbucket.core.plugin.PluginRegistry().getRepositorySettingTabs.map { tab =>
     @tab(repository, context).map { link =>
       <li@if(active==link.id){ class="active"}>
-        <a href="@url(repository)/@link.path">@link.label</a>
+        <a href="@helpers.url(repository)/@link.path">@link.label</a>
       </li>
     }
   }
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index 907bf67..490da70 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -1,11 +1,10 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main("Settings", Some(repository)){
-  @html.menu("settings", repository){
-    @menu("options", repository){
-      @helper.html.information(info)
-      <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Settings", Some(repository)){
+  @gitbucket.core.html.menu("settings", repository){
+    @gitbucket.core.settings.html.menu("options", repository){
+      @gitbucket.core.helper.html.information(info)
+      <form id="form" method="post" action="@helpers.url(repository)/settings/options" validate="true">
         <div class="panel panel-default">
           <div class="panel-heading strong">Settings</div>
           <div class="panel-body">
diff --git a/src/main/twirl/gitbucket/core/wiki/compare.scala.html b/src/main/twirl/gitbucket/core/wiki/compare.scala.html
index ea76b3e..3745cb7 100644
--- a/src/main/twirl/gitbucket/core/wiki/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/compare.scala.html
@@ -5,11 +5,10 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean,
   info: Option[Any])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
-  @helper.html.information(info)
-  @html.menu("wiki", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
+  @gitbucket.core.helper.html.information(info)
+  @gitbucket.core.html.menu("wiki", repository){
     <ul class="nav nav-tabs fill-width">
       <li>
         <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
@@ -17,23 +16,23 @@
       <li class="pull-right">
         <div class="btn-group">
         @if(pageName.isDefined){
-          <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-          <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
+          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)">View Page</a>
+          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Back to Page History</a>
         } else {
-          <a class="btn btn-small btn-default" href="@url(repository)/wiki/_history">Back to Wiki History</a>
+          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_history">Back to Wiki History</a>
         }
         </div>
       </li>
     </ul>
     <div class="pull-left">
-      @helper.html.diff(diffs, repository, None, None, false, None, false, false)
+      @gitbucket.core.helper.html.diff(diffs, repository, None, None, false, None, false, false)
     </div>
     @if(hasWritePermission){
       <div>
         @if(pageName.isDefined){
-          <a href="@url(repository)/wiki/@urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
+          <a href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
         } else {
-          <a href="@url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
+          <a href="@helpers.url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
         }
       </div>
     }
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 7276c45..3089dfc 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -1,19 +1,19 @@
 @(pageName: String,
   page: Option[gitbucket.core.service.WikiService.WikiPageInfo],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @import gitbucket.core.util.FileUtil
 @gitbucket.core.html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("wiki", repository){
     <div class="pull-right">
       @if(page.isDefined){
-        <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
-        <a class="btn btn-small btn-danger" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
+        <a class="btn btn-small btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
       }
-      <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
+      <a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
     </div>
     <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
-    <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
+    <form action="@helpers.url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
       <span id="error-pageName" class="error"></span>
       <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/>
       <div class="muted attachable">
diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html
index 35af74a..ad931f2 100644
--- a/src/main/twirl/gitbucket/core/wiki/history.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html
@@ -1,19 +1,18 @@
 @(pageName: Option[String],
   commits: List[gitbucket.core.util.JGitUtil.CommitInfo],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.menu("wiki", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
+  @gitbucket.core.html.menu("wiki", repository){
     <div class="pull-right">
     @if(pageName.isEmpty){
-      @if(loginAccount.isDefined){
-        <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
+      @if(context.loginAccount.isDefined){
+        <a class="btn btn-small" href="@helpers.url(repository)/wiki/_new">New Page</a>
       }
     } else {
-      @if(loginAccount.isDefined){
-        <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
-        <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
+      @if(context.loginAccount.isDefined){
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
+        <a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
       }
     }
     </div>
@@ -39,9 +38,9 @@
       @commits.map { commit =>
         <tr>
           <td style="width: 32px; text-align: center ;"><input type="checkbox" name="commitId" value="@commit.id"></td>
-          <td style="width: 200px;">@avatar(commit, 20)&nbsp;@user(commit.authorName, commit.authorEmailAddress)</td>
+          <td style="width: 200px;">@helpers.avatar(commit, 20)&nbsp;@helpers.user(commit.authorName, commit.authorEmailAddress)</td>
           <td>
-            <span class="muted">@helper.html.datetimeago(commit.authorTime):</span>&nbsp;@commit.shortMessage
+            <span class="muted">@gitbucket.core.helper.html.datetimeago(commit.authorTime):</span>&nbsp;@commit.shortMessage
           </td>
         </tr>
       }
@@ -57,10 +56,10 @@
         var e = $('input[name=commitId]:checked');
         if(e.length == 2){
           @if(pageName.isEmpty){
-            location.href = '@url(repository)/wiki/_compare/' +
+            location.href = '@helpers.url(repository)/wiki/_compare/' +
               $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
           } else {
-            location.href = '@url(repository)/wiki/@urlEncode(pageName.get)/_compare/' +
+            location.href = '@helpers.url(repository)/wiki/@helpers.urlEncode(pageName.get)/_compare/' +
               $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
           }
         }
diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html
index aa07f04..63a1ec3 100644
--- a/src/main/twirl/gitbucket/core/wiki/page.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -5,21 +5,20 @@
   hasWritePermission: Boolean,
   sidebar: Option[gitbucket.core.service.WikiService.WikiPageInfo],
   footer: Option[gitbucket.core.service.WikiService.WikiPageInfo])(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@import gitbucket.core.service.WikiService.{wikiHttpUrl, wikiSshUrl}
-@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.menu("wiki", repository){
+@import gitbucket.core.view.helpers
+@import gitbucket.core.service.WikiService
+@gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
+  @gitbucket.core.html.menu("wiki", repository){
     <div>
       @if(hasWritePermission){
         <div class="pull-right">
-          <a class="btn btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
-          <a class="btn btn-success" href="@url(repository)/wiki/_new">New Page</a>
+          <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
+          <a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
         </div>
       }
       <h1 class="body-title">@pageName</h1>
       <div>
-        <span class="muted"><strong>@page.committer</strong> edited this page @helper.html.datetimeago(page.time)</span>
+        <span class="muted"><strong>@page.committer</strong> edited this page @gitbucket.core.helper.html.datetimeago(page.time)</span>
       </div>
       <hr>
     </div>
@@ -36,7 +35,7 @@
           <ul id="pages-index" class="list-group list-group-flush">
             @pages.zipWithIndex.map { case (page, i) =>
               <li class="list-group-item page-link" style="border: none; @if(i > max - 1){display:none;}">
-                <a href="@url(repository)/wiki/@urlEncode(page)" class="strong">@page</a>
+                <a href="@helpers.url(repository)/wiki/@helpers.urlEncode(page)" class="strong">@page</a>
               </li>
             }
             @if(pages.size > max){
@@ -50,13 +49,13 @@
       @sidebar.map { sidebarPage =>
         <div class="wiki-sidebar">
           @if(hasWritePermission){
-            <a href="@url(repository)/wiki/_Sidebar/_edit" style="text-decoration: none;"><span class="octicon octicon-pencil pull-right"></span></a>
+            <a href="@helpers.url(repository)/wiki/_Sidebar/_edit" style="text-decoration: none;"><span class="octicon octicon-pencil pull-right"></span></a>
           }
-          @markdown(sidebarPage.content, repository, true, false, false, false, pages)
+          @helpers.markdown(sidebarPage.content, repository, true, false, false, false, pages)
         </div>
       }.getOrElse{
         @if(hasWritePermission){
-          <a class="button-link" href="@url(repository)/wiki/_Sidebar/_edit" style="text-decoration: none;">
+          <a class="button-link" href="@helpers.url(repository)/wiki/_Sidebar/_edit" style="text-decoration: none;">
             <div class="wiki-sidebar-dotted text-center"><i class="octicon octicon-plus"></i> Add a custom sidebar</div>
           </a>
         }
@@ -64,10 +63,10 @@
       <div>
         <strong>Clone this wiki locally</strong>
       </div>
-      @helper.html.copy("repository-url-copy", wikiHttpUrl(repository)){
-        <input type="text" value="@wikiHttpUrl(repository)" id="repository-url" class="form-control input-sm" readonly>
+      @gitbucket.core.helper.html.copy("repository-url-copy", WikiService.wikiHttpUrl(repository)){
+        <input type="text" value="@WikiService.wikiHttpUrl(repository)" id="repository-url" class="form-control input-sm" readonly>
       }
-      @if(wikiSshUrl(repository).isDefined) {
+      @if(WikiService.wikiSshUrl(repository).isDefined) {
         <div class="small">
           <span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
         </div>
@@ -75,7 +74,7 @@
     </div>
     <div style="margin-right: 260px;">
       <div class="markdown-body">
-        @markdown(
+        @helpers.markdown(
           markdown = page.content,
           repository = repository,
           enableWikiLink = true,
@@ -89,13 +88,13 @@
       @footer.map { footerPage =>
         <div class="wiki-sidebar wiki-footer">
           @if(hasWritePermission){
-            <a href="@url(repository)/wiki/_Footer/_edit" style="text-decoration: none;"><span class="octicon octicon-pencil pull-right"></span></a>
+            <a href="@helpers.url(repository)/wiki/_Footer/_edit" style="text-decoration: none;"><span class="octicon octicon-pencil pull-right"></span></a>
           }
-          @markdown(footerPage.content, repository, true, false, false, false, pages)
+          @helpers.markdown(footerPage.content, repository, true, false, false, false, pages)
         </div>
       }.getOrElse{
         @if(hasWritePermission){
-          <a class="button-link" href="@url(repository)/wiki/_Footer/_edit" style="text-decoration: none;">
+          <a class="button-link" href="@helpers.url(repository)/wiki/_Footer/_edit" style="text-decoration: none;">
             <div class="wiki-sidebar-dotted text-center"><i class="octicon octicon-plus"></i> Add a custom footer</div>
           </a>
         }
@@ -128,9 +127,9 @@
     $('#triangle-right').show();
   }
 
-  @wikiSshUrl(repository).map { sshUrl =>
+  @WikiService.wikiSshUrl(repository).map { sshUrl =>
     $('#repository-url-http').click(function(){
-      $('#repository-url').val('@wikiHttpUrl(repository)');
+      $('#repository-url').val('@WikiService.wikiHttpUrl(repository)');
       $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
     });
     $('#repository-url-ssh').click(function(){
diff --git a/src/main/twirl/gitbucket/core/wiki/pages.scala.html b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
index 9ef2f5c..cf6fd59 100644
--- a/src/main/twirl/gitbucket/core/wiki/pages.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
@@ -1,10 +1,9 @@
 @(pages: List[String],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.menu("wiki", repository){
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
+  @gitbucket.core.html.menu("wiki", repository){
     <ul class="nav nav-tabs fill-width">
       <li>
         <h1 class="wiki-title"><span class="muted">Pages</span></h1>
@@ -12,14 +11,14 @@
       <li class="pull-right">
         <div class="btn-group">
           @if(hasWritePermission){
-            <a class="btn btn-small btn-default" href="@url(repository)/wiki/_new">New Page</a>
+            <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
           }
         </div>
       </li>
     </ul>
     <ul class="pull-left">
       @pages.map { page =>
-        <li><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
+        <li><a href="@helpers.url(repository)/wiki/@helpers.urlEncode(page)">@page</a></li>
       }
     </ul>
   }