diff --git a/src/main/twirl/gitbucket/core/account/repositories.scala.html b/src/main/twirl/gitbucket/core/account/repositories.scala.html
index ceb871c..b4c7acf 100644
--- a/src/main/twirl/gitbucket/core/account/repositories.scala.html
+++ b/src/main/twirl/gitbucket/core/account/repositories.scala.html
@@ -2,7 +2,6 @@
   repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
   isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 @gitbucket.core.account.html.main(account, groupNames, "repositories", isGroupManager){
   @if(repositories.isEmpty){
     No repositories
@@ -25,7 +24,7 @@
           @if(repository.repository.description.isDefined){
             <div>@repository.repository.description</div>
           }
-          <div><span class="muted small">Updated @datetimeago(repository.repository.lastActivityDate)</span></div>
+          <div><span class="muted small">Updated @gitbucket.core.helper.html.datetimeago(repository.repository.lastActivityDate)</span></div>
         </div>
       </div>
     }
diff --git a/src/main/twirl/gitbucket/core/dashboard/header.scala.html b/src/main/twirl/gitbucket/core/dashboard/header.scala.html
index 0945ce0..bc174bc 100644
--- a/src/main/twirl/gitbucket/core/dashboard/header.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/header.scala.html
@@ -2,62 +2,61 @@
   closedCount: Int,
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
   groups: List[String])(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.helper.html.{checkicon, dropdown}
 @import gitbucket.core.view.helpers
 <div id="table-issues-control">
   @gitbucket.core.helper.html.dropdown("Visibility"){
     <li>
       <a href="@(condition.copy(visibility = (if(condition.visibility == Some("private")) None else Some("private"))).toURL)">
-        @checkicon(condition.visibility == Some("private"))
+        @gitbucket.core.helper.html.checkicon(condition.visibility == Some("private"))
         Private repository only
       </a>
     </li>
     <li>
       <a href="@(condition.copy(visibility = (if(condition.visibility == Some("public")) None else Some("public"))).toURL)">
-        @checkicon(condition.visibility == Some("public"))
+        @gitbucket.core.helper.html.checkicon(condition.visibility == Some("public"))
         Public repository only
       </a>
     </li>
   }
-  @dropdown("Organization"){
+  @gitbucket.core.helper.html.dropdown("Organization"){
     @groups.map { group =>
       <li>
         <a href="@((if(condition.groups.contains(group)) condition.copy(groups = condition.groups - group) else condition.copy(groups = condition.groups + group)).toURL)">
-          @checkicon(condition.groups.contains(group))
+          @gitbucket.core.helper.html.checkicon(condition.groups.contains(group))
           @helpers.avatar(group, 20) @group
         </a>
       </li>
     }
   }
-  @dropdown("Sort"){
+  @gitbucket.core.helper.html.dropdown("Sort"){
     <li>
       <a href="@condition.copy(sort="created",  direction="desc").toURL">
-        @checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+        @gitbucket.core.helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
       </a>
     </li>
     <li>
       <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-        @checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+        @gitbucket.core.helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
       </a>
     </li>
     <li>
       <a href="@condition.copy(sort="comments", direction="desc").toURL">
-       @checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+       @gitbucket.core.helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
       </a>
     </li>
     <li>
       <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-        @checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+        @gitbucket.core.helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
       </a>
     </li>
     <li>
       <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-        @checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+        @gitbucket.core.helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
       </a>
     </li>
     <li>
       <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-        @checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+        @gitbucket.core.helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
       </a>
     </li>
   }
diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
index ec2b90b..f6db4a0 100644
--- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
@@ -1,7 +1,6 @@
 @(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
   userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.repositoryicon
 <div class="main-sidebar">
   <div class="sidebar">
   <ul class="nav sidebar-menu">
@@ -17,9 +16,9 @@
         @userRepositories.zipWithIndex.map { case (repository, i) =>
         <li class="repo-link" style="@if(i > max - 1){display:none;}">
           @if(repository.owner == context.loginAccount.get.userName){
-            <a href="@helpers.url(repository)">@repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
+            <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
           } else {
-            <a href="@helpers.url(repository)">@repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
+            <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
           }
           </li>
         }
@@ -38,7 +37,7 @@
       @defining(10){ max =>
         @recentRepositories.zipWithIndex.map { case (repository, i) =>
           <li class="repo-link" style="@if(i > max - 1){display:none;}">
-            <a href="@helpers.url(repository)">@repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
+            <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
           </li>
         }
         @if(recentRepositories.size > max){
diff --git a/src/main/twirl/gitbucket/core/helper/activities.scala.html b/src/main/twirl/gitbucket/core/helper/activities.scala.html
index 08262f1..8d01d0d 100644
--- a/src/main/twirl/gitbucket/core/helper/activities.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html
@@ -1,6 +1,5 @@
 @(activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 
 @if(activities.isEmpty){
   No activity
@@ -65,7 +64,7 @@
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
   *@
   <div>
-    <div class="muted small">@datetimeago(activity.activityDate)</div>
+    <div class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @helpers.avatar(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
@@ -81,7 +80,7 @@
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
   *@
   <div>
-    <div class="muted small">@datetimeago(activity.activityDate)</div>
+    <div class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @helpers.avatar(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
@@ -95,7 +94,7 @@
   <div class="activity-icon-small"><i class="octicon octicon-@image"></i></div>
   *@
   <div>
-    <span class="muted small">@datetimeago(activity.activityDate)</span>
+    <span class="muted small">@gitbucket.core.helper.html.datetimeago(activity.activityDate)</span>
     <div>
       @helpers.avatar(activity.activityUserName, 16)
       @helpers.activityMessage(activity.message)
diff --git a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
index ae9e5e8..cf042f3 100644
--- a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
@@ -3,7 +3,6 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 <div class="@if(comment.fileName.isDefined && (!latestCommitId.isDefined || latestCommitId.get == comment.commitId)){inline-comment}"
     id="discussion_r@comment.commentId"
     @if(comment.fileName.isDefined){filename="@comment.fileName.get"}
@@ -23,7 +22,7 @@
             }
             in <a href="@context.path/@repository.owner/@repository.name/commit/@comment.commitId">@comment.commitId.substring(0, 7)</a>
           }
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </span>
       <span class="pull-right">
         @if(hasWritePermission || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
index 4d50975..268c7a5 100644
--- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
@@ -4,13 +4,12 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   pullreq: Option[gitbucket.core.model.PullRequest] = None)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 @import gitbucket.core.model.CommitComment
 @if(issue.isDefined){
   <div class="issue-avatar-image">@helpers.avatarLink(issue.get.openedUserName, 48)</div>
   <div class="panel panel-default issue-comment-box">
     <div class="panel-heading">
-      @helpers.user(issue.get.openedUserName, styleClass="username strong") <span class="muted">commented @datetimeago(issue.get.registeredDate)</span>
+      @helpers.user(issue.get.openedUserName, styleClass="username strong") <span class="muted">commented @gitbucket.core.helper.html.datetimeago(issue.get.registeredDate)</span>
       <span class="pull-right">
         @if(hasWritePermission || context.loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){
           <a href="#" data-issue-id="@issue.get.issueId"><i class="octicon octicon-pencil" aria-label="Edit"></i></a>
@@ -46,7 +45,7 @@
             } else {
               referenced the @issueOrPullRequest()
             }
-            @datetimeago(comment.registeredDate)
+            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
           </span>
           @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer"
                 && (hasWritePermission || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
@@ -83,7 +82,7 @@
             @helpers.avatar(comment.commentedUserName, 16)
             @helpers.user(comment.commentedUserName, styleClass="username strong")
             added a commit that referenced this @issueOrPullRequest()
-            @datetimeago(comment.registeredDate)
+            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
           </div>
           <div style="discussion-item-content">
             @commitId.map{ id =>
@@ -106,7 +105,7 @@
           @helpers.avatar(comment.commentedUserName, 16)
           @helpers.user(comment.commentedUserName, styleClass="username strong")
           referenced the @issueOrPullRequest()
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </div>
         <div style="discussion-item-content">
           @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
@@ -128,7 +127,7 @@
           } else {
             <code>@pullreq.map(_.userName):@pullreq.map(_.branch)</code> from <code>@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</code>
           }
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </div>
       </div>
     }
@@ -139,7 +138,7 @@
           @helpers.avatar(comment.commentedUserName, 16)
           @helpers.user(comment.commentedUserName, styleClass="username strong")
           closed this @issueOrPullRequest()
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </div>
       </div>
     }
@@ -150,7 +149,7 @@
           @helpers.avatar(comment.commentedUserName, 16)
           @helpers.user(comment.commentedUserName, styleClass="username strong")
           reopened the @issueOrPullRequest()
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </div>
       </div>
     }
@@ -161,7 +160,7 @@
           @helpers.avatar(comment.commentedUserName, 16)
           @helpers.user(comment.commentedUserName, styleClass="username strong")
           deleted the <code>@pullreq.map(_.requestBranch)</code> branch
-          @datetimeago(comment.registeredDate)
+          @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
         </div>
       </div>
     }
diff --git a/src/main/twirl/gitbucket/core/issues/issue.scala.html b/src/main/twirl/gitbucket/core/issues/issue.scala.html
index 2cca3ff..2cc65b6 100644
--- a/src/main/twirl/gitbucket/core/issues/issue.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issue.scala.html
@@ -7,7 +7,6 @@
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 @gitbucket.core.html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("issues", repository){
     <div>
@@ -38,7 +37,7 @@
         <span class="label label-success issue-status">Open</span>
       }
       <span class="muted">
-        @helpers.user(issue.openedUserName, styleClass="username strong") opened this issue @datetimeago(issue.registeredDate) - @defining(
+        @helpers.user(issue.openedUserName, styleClass="username strong") opened this issue @gitbucket.core.helper.html.datetimeago(issue.registeredDate) - @defining(
           comments.count( _.action.contains("comment") )
         ){ count =>
           @count @helpers.plural(count, "comment")
diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
index 71edd6c..8ec1078 100644
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -7,17 +7,15 @@
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.dropdown
-@import gitbucket.core.helper.html.checkicon
 <div style="margin-bottom: 14px;">
   <span class="muted small strong">Labels</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @dropdown("Edit", right = true) {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true) {
         @labels.map { label =>
           <li>
             <a href="#" class="toggle-label" data-label-id="@label.labelId">
-              @checkicon(issueLabels.exists(_.labelId == label.labelId))
+              @gitbucket.core.helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
               <span class="label" style="background-color: #@label.color;">&nbsp;</span>
               @label.labelName
             </a>
@@ -38,13 +36,13 @@
   <span class="muted small strong">Milestone</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @dropdown("Edit", right = true) {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true) {
         <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="octicon octicon-x"></i> Clear this milestone</a></li>
         @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
           <li>
             <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
               @issue.map { issue =>
-                @checkicon(Some(milestone.milestoneId) == issue.milestoneId)
+                @gitbucket.core.helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId)
               }
               @milestone.title
               <div class="small" style="padding-left: 20px;">
@@ -90,12 +88,12 @@
   <span class="muted small strong">Assignee</span>
   @if(hasWritePermission){
     <div class="pull-right">
-      @dropdown("Edit", right = true) {
+      @gitbucket.core.helper.html.dropdown("Edit", right = true) {
         <li><a href="javascript:void(0);" class="assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
         @collaborators.map { collaborator =>
           <li>
             <a href="javascript:void(0);" class="assign" data-name="@collaborator">
-              @checkicon(issue.exists(_.assignedUserName.exists(_ == collaborator)))@helpers.avatar(collaborator, 20) @collaborator
+              @gitbucket.core.helper.html.checkicon(issue.exists(_.assignedUserName.exists(_ == collaborator)))@helpers.avatar(collaborator, 20) @collaborator
             </a>
           </li>
         }
diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
index 8d06cb1..232a386 100644
--- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
@@ -10,9 +10,6 @@
   repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None,
   hasWritePermission: Boolean = false)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.dropdown
-@import gitbucket.core.helper.html.checkicon
-@import gitbucket.core.helper.html.datetimeago
 @import gitbucket.core.service.IssuesService.IssueInfo
 @*
 @if(condition.nonEmpty){
@@ -30,96 +27,96 @@
       <th style="background-color: #eee;">
         <input type="checkbox"/>
         <span id="table-issues-control">
-          @dropdown("Author") {
+          @gitbucket.core.helper.html.dropdown("Author") {
             @collaborators.map { collaborator =>
               <li>
                 <a href="@condition.copy(author = (if(condition.author == Some(collaborator)) None else Some(collaborator))).toURL">
-                  @checkicon(condition.author == Some(collaborator))
+                  @gitbucket.core.helper.html.checkicon(condition.author == Some(collaborator))
                   @helpers.avatar(collaborator, 20) @collaborator
                 </a>
               </li>
             }
           }
-          @dropdown("Label") {
+          @gitbucket.core.helper.html.dropdown("Label") {
             @labels.map { label =>
               <li>
                 <a href="@condition.copy(labels = (if(condition.labels.contains(label.labelName)) condition.labels - label.labelName else condition.labels + label.labelName)).toURL">
-                  @checkicon(condition.labels.contains(label.labelName))
+                  @gitbucket.core.helper.html.checkicon(condition.labels.contains(label.labelName))
                   <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
                   @label.labelName
                 </a>
               </li>
             }
           }
-          @dropdown("Milestone") {
+          @gitbucket.core.helper.html.dropdown("Milestone") {
             <li>
               <a href="@condition.copy(milestone = (if(condition.milestone == Some(None)) None else Some(None))).toURL">
-                @checkicon(condition.milestone == Some(None)) Issues with no milestone
+                @gitbucket.core.helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone
               </a>
             </li>
             @milestones.filter(_.closedDate.isEmpty).map { milestone =>
               <li>
                 <a href="@condition.copy(milestone = (if(condition.milestone == Some(Some(milestone.title))) None else Some(Some(milestone.title)))).toURL">
-                  @checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title
+                  @gitbucket.core.helper.html.checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title
                 </a>
               </li>
             }
           }
-          @dropdown("Assignee") {
+          @gitbucket.core.helper.html.dropdown("Assignee") {
             <li>
               <a href="@condition.copy(assigned = (if(condition.assigned == Some(None)) None else Some(None))).toURL">
-                @checkicon(condition.assigned == Some(None)) Assigned to nobody
+                @gitbucket.core.helper.html.checkicon(condition.assigned == Some(None)) Assigned to nobody
               </a>
             </li>
             @collaborators.map { collaborator =>
               <li>
                 <a href="@condition.copy(assigned = (if(condition.assigned == Some(Some(collaborator))) None else Some(Some(collaborator)))).toURL">
-                  @checkicon(condition.assigned == Some(Some(collaborator)))
+                  @gitbucket.core.helper.html.checkicon(condition.assigned == Some(Some(collaborator)))
                   @helpers.avatar(collaborator, 20) @collaborator
                 </a>
               </li>
             }
           }
-          @dropdown("Sort"){
+          @gitbucket.core.helper.html.dropdown("Sort"){
             <li>
               <a href="@condition.copy(sort="created",  direction="desc").toURL">
-                @checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+                @gitbucket.core.helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
               </a>
             </li>
             <li>
               <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-                @checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+                @gitbucket.core.helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
               </a>
             </li>
             <li>
               <a href="@condition.copy(sort="comments", direction="desc").toURL">
-                @checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+                @gitbucket.core.helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
               </a>
             </li>
             <li>
               <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-                @checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+                @gitbucket.core.helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
               </a>
             </li>
             <li>
               <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-                @checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+                @gitbucket.core.helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
               </a>
             </li>
             <li>
               <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-                @checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+                @gitbucket.core.helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
               </a>
             </li>
           }
         </span>
         @if(hasWritePermission){
           <span id="table-issues-batchedit">
-            @dropdown("Mark as") {
+            @gitbucket.core.helper.html.dropdown("Mark as") {
               <li><a href="javascript:void(0);" class="toggle-state" data-id="open">Open</a></li>
               <li><a href="javascript:void(0);" class="toggle-state" data-id="close">Close</a></li>
             }
-            @dropdown("Label") {
+            @gitbucket.core.helper.html.dropdown("Label") {
               @labels.map { label =>
                 <li>
                   <a href="javascript:void(0);" class="toggle-label" data-id="@label.labelId">
@@ -130,13 +127,13 @@
                 </li>
               }
             }
-            @dropdown("Milestone") {
+            @gitbucket.core.helper.html.dropdown("Milestone") {
               <li><a href="javascript:void(0);" class="toggle-milestone" data-id="">No milestone</a></li>
               @milestones.filter(_.closedDate.isEmpty).map { milestone =>
                 <li><a href="javascript:void(0);" class="toggle-milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
               }
             }
-            @dropdown("Assignee") {
+            @gitbucket.core.helper.html.dropdown("Assignee") {
               <li><a href="javascript:void(0);" class="toggle-assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
               @collaborators.map { collaborator =>
                 <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="octicon"></i>@helpers.avatar(collaborator, 20) @collaborator</a></li>
@@ -210,7 +207,7 @@
             }
           </span>
           <div class="small muted" style="margin-left: 12px; margin-top: 2px;">
-            #@issue.issueId opened @datetimeago(issue.registeredDate) by @helpers.user(issue.openedUserName, styleClass="username")
+            #@issue.issueId opened @gitbucket.core.helper.html.datetimeago(issue.registeredDate) by @helpers.user(issue.openedUserName, styleClass="username")
             @milestone.map { milestone =>
               <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>
             }
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html
index b4a9e5f..92b1821 100644
--- a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html
@@ -1,7 +1,6 @@
 @(milestone: Option[gitbucket.core.model.Milestone],
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datepicker
 @gitbucket.core.html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @gitbucket.core.html.menu("milestones", repository){
     @if(milestone.isEmpty){
@@ -21,7 +20,7 @@
       </fieldset>
       <fieldset class="form-group">
         <label for="dueDate" class="strong">Due Date</label>
-        @datepicker("dueDate", milestone.flatMap(_.dueDate))
+        @gitbucket.core.helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
         <span id="error-dueDate" class="error"></span>
       </fieldset>
       <hr>
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
index 8c10d2f..53cf0ab 100644
--- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
@@ -3,7 +3,6 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 @gitbucket.core.html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @gitbucket.core.html.menu("milestones", repository){
     @if(context.loginAccount.isDefined){
@@ -38,7 +37,7 @@
                   <a href="@helpers.url(repository)/issues?milestone=@milestone.title&state=open" class="milestone-title">@milestone.title</a>
                   <div>
                     @if(milestone.closedDate.isDefined){
-                      <span class="muted">Closed @datetimeago(milestone.closedDate.get)</span>
+                      <span class="muted">Closed @gitbucket.core.helper.html.datetimeago(milestone.closedDate.get)</span>
                     } else {
                       @milestone.dueDate.map { dueDate =>
                         @if(helpers.isPast(dueDate)){
diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
index 83df3ec..7138fc8 100644
--- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
@@ -2,7 +2,6 @@
   comments: Option[List[gitbucket.core.model.Comment]] = None,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 <table class="table table-bordered">
 @commits.map { day =>
   <tr>
@@ -28,11 +27,11 @@
             <div>
               @if(commit.isDifferentFromAuthor) {
                 @helpers.user(commit.authorName, commit.authorEmailAddress, "username")
-                <span class="muted">authored @datetimeago(commit.authorTime)</span>
+                <span class="muted">authored @gitbucket.core.helper.html.datetimeago(commit.authorTime)</span>
                 <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
               }
               @helpers.user(commit.committerName, commit.committerEmailAddress, "username")
-              <span class="muted">committed @datetimeago(commit.commitTime)</span>
+              <span class="muted">committed @gitbucket.core.helper.html.datetimeago(commit.commitTime)</span>
             </div>
           </div>
         </div>
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index fc0f6dd..bb439fb 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -15,30 +15,29 @@
   milestones: List[gitbucket.core.model.Milestone],
   labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html._
 @gitbucket.core.html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("pulls", repository){
     <div class="pullreq-info">
       <div id="compare-edit">
-        @dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
+        @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
           @members.map { case (owner, name) =>
-            <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@checkicon(owner == originRepository.owner) @owner/@name</a></li>
+            <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
           }
         }
-        @dropdown(originId, "base") {
+        @gitbucket.core.helper.html.dropdown(originId, "base") {
           @originRepository.branchList.map { branch =>
-            <li><a href="#" class="origin-branch" data-branch="@helpers.encodeRefName(branch)">@checkicon(branch == originId) @branch</a></li>
+            <li><a href="#" class="origin-branch" data-branch="@helpers.encodeRefName(branch)">@gitbucket.core.helper.html.checkicon(branch == originId) @branch</a></li>
           }
         }
         ...
-        @dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
+        @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
           @members.map { case (owner, name) =>
-            <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
+            <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
           }
         }
-        @dropdown(forkedId, "compare") {
+        @gitbucket.core.helper.html.dropdown(forkedId, "compare") {
           @forkedRepository.branchList.map { branch =>
-            <li><a href="#" class="forked-branch" data-branch="@helpers.encodeRefName(branch)">@checkicon(branch == forkedId) @branch</a></li>
+            <li><a href="#" class="forked-branch" data-branch="@helpers.encodeRefName(branch)">@gitbucket.core.helper.html.checkicon(branch == forkedId) @branch</a></li>
           }
         }
       </div>
diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
index 690a456..2e9a32a 100644
--- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -11,7 +11,6 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   flash: Map[String, String])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@import gitbucket.core.helper.html.datetimeago
 @import gitbucket.core.model.IssueComment
 @import gitbucket.core.model.CommitComment
 @gitbucket.core.html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
@@ -50,7 +49,7 @@
             <span class="muted">
               @helpers.user(comment.commentedUserName, styleClass="username strong") merged @commits.size @helpers.plural(commits.size, "commit")
               into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-              @datetimeago(comment.registeredDate)
+              @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
             </span>
           }.getOrElse {
             <span class="label label-important issue-status">Closed</span>
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index 33e5395..23bbc5e 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -6,8 +6,6 @@
   hasWritePermission: Boolean,
   isBlame: Boolean)(implicit context: gitbucket.core.controller.Context)
 @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">
@@ -36,7 +34,7 @@
         hasWritePermission
       ){
         @repository.branchList.map { x =>
-          <li><a href="@helpers.url(repository)/blob/@helpers.encodeRefName(x)/@pathList.mkString("/")">@checkicon(x == branch) @x</a></li>
+          <li><a href="@helpers.url(repository)/blob/@helpers.encodeRefName(x)/@pathList.mkString("/")">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
         }
       }
       <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
@@ -51,7 +49,7 @@
     <div class="box-header">
       @helpers.avatar(latestCommit, 28)
       @helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
-      <span class="muted">@datetimeago(latestCommit.commitTime)</span>
+      <span class="muted">@gitbucket.core.helper.html.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)){