diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index ab77092..0574dc0 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -34,13 +34,13 @@
   get("/:userName") {
     val userName = params("userName")
     getAccountByUserName(userName).map {
-      account.html.userinfo(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
+      account.html.info(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
     } getOrElse NotFound
   }
 
   get("/:userName/_edit")(ownerOnly {
     val userName = params("userName")
-    getAccountByUserName(userName).map(x => account.html.useredit(Some(x))) getOrElse NotFound
+    getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
   })
 
   post("/:userName/_edit", editForm)(ownerOnly { form =>
@@ -56,7 +56,7 @@
 
   get("/register"){
     if(loadSystemSettings().allowAccountRegistration){
-      account.html.useredit(None)
+      account.html.edit(None)
     } else NotFound
   }
 
diff --git a/src/main/scala/app/LabelsController.scala b/src/main/scala/app/LabelsController.scala
index 8f79b16..dbf43e5 100644
--- a/src/main/scala/app/LabelsController.scala
+++ b/src/main/scala/app/LabelsController.scala
@@ -36,7 +36,7 @@
     val repository = params("repository")
 
     getRepository(owner, repository, baseUrl)
-      .map(issues.html.labeleditlist(getLabels(owner, repository), _)) getOrElse NotFound()
+      .map(issues.labels.html.editlist(getLabels(owner, repository), _)) getOrElse NotFound()
   })
 
   ajaxGet("/:owner/:repository/issues/label/:labelId/edit")(writableRepository {
@@ -45,7 +45,7 @@
     val labelId    = params("labelId").toInt
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
-      getLabel(owner, repository, labelId).map(label => issues.html.labeledit(Some(label), repositoryInfo)) getOrElse NotFound()
+      getLabel(owner, repository, labelId).map(label => issues.labels.html.edit(Some(label), repositoryInfo)) getOrElse NotFound()
     } getOrElse NotFound()
   })
 
@@ -56,7 +56,7 @@
 
     getRepository(owner, repository, baseUrl).map{ repositoryInfo =>
       updateLabel(owner, repository, labelId, form.labelName, form.color.substring(1))
-      issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
+      issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
     } getOrElse NotFound()
   })
 
@@ -67,7 +67,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       deleteLabel(owner, repository, labelId)
-      issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
+      issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
     } getOrElse NotFound()
   })
 
diff --git a/src/main/scala/app/MilestonesController.scala b/src/main/scala/app/MilestonesController.scala
index 9bbb093..08d3b06 100644
--- a/src/main/scala/app/MilestonesController.scala
+++ b/src/main/scala/app/MilestonesController.scala
@@ -27,7 +27,7 @@
     val state      = params.getOrElse("state", "open")
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
-      issues.html.milestones(state,
+      issues.milestones.html.list(state,
         getMilestonesWithIssueCount(owner, repository),
         repositoryInfo,
         isWritable(owner, repository, context.loginAccount))
@@ -38,7 +38,7 @@
     val owner      = params("owner")
     val repository = params("repository")
 
-    getRepository(owner, repository, baseUrl).map(issues.html.milestoneedit(None, _)) getOrElse NotFound
+    getRepository(owner, repository, baseUrl).map(issues.milestones.html.edit(None, _)) getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/new", milestoneForm)(writableRepository { form =>
@@ -55,7 +55,7 @@
     val milestoneId = params("milestoneId").toInt
 
     getRepository(owner, repository, baseUrl).map(
-      issues.html.milestoneedit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
+      issues.milestones.html.edit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableRepository { form =>
diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index d503554..6fe73af 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -33,7 +33,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       getWikiPage(owner, repository, "Home").map { page =>
-        wiki.html.wiki("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
+        wiki.html.page("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
       } getOrElse redirect("/%s/%s/wiki/Home/_edit".format(owner, repository))
     } getOrElse NotFound
   })
@@ -45,7 +45,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       getWikiPage(owner, repository, pageName).map { page =>
-        wiki.html.wiki(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
+        wiki.html.page(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
       } getOrElse redirect("/%s/%s/wiki/%s/_edit".format(owner, repository, pageName)) // TODO URLEncode
     } getOrElse NotFound
   })
@@ -57,7 +57,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikihistory(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
+        wiki.html.history(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -70,7 +70,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikicompare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
+        wiki.html.compare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -82,7 +82,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikicompare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
+        wiki.html.compare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -93,7 +93,7 @@
     val page       = params("page")
 
     getRepository(owner, repository, baseUrl).map(
-      wiki.html.wikiedit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
+      wiki.html.edit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(writableRepository { form =>
@@ -111,7 +111,7 @@
     val owner      = params("owner")
     val repository = params("repository")
 
-    getRepository(owner, repository, baseUrl).map(wiki.html.wikiedit("", None, _)) getOrElse NotFound
+    getRepository(owner, repository, baseUrl).map(wiki.html.edit("", None, _)) getOrElse NotFound
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(writableRepository { form =>
@@ -140,7 +140,7 @@
     val repository = params("repository")
 
     getRepository(owner, repository, baseUrl).map {
-      wiki.html.wikipages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
+      wiki.html.pages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
     } getOrElse NotFound
   })
   
@@ -150,7 +150,7 @@
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikihistory(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
+        wiki.html.history(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
       }
     } getOrElse NotFound
   })
diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
new file mode 100644
index 0000000..4b8bf47
--- /dev/null
+++ b/src/main/twirl/account/edit.scala.html
@@ -0,0 +1,46 @@
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){
+  @if(account.isDefined){
+    <h3>Edit your profile</h3>
+  } else {
+    <h3>Create your account</h3>
+  }
+  <form action="@if(account.isDefined){@url(account.get.userName)/_edit}else{/register}" method="POST" validate="true">
+    @if(account.isEmpty){
+      <fieldset>
+        <label for="userName"><strong>User name</strong></label>
+        <input type="text" name="userName" id="userName" value=""/>
+        <span id="error-userName" class="error"></span>
+      </fieldset>
+    }
+    <fieldset>
+      <label for="password"><strong>Password</strong>
+        @if(account.nonEmpty){
+          (Input to change password)
+        }
+      </label>
+      <input type="password" name="password" id="password" value=""/>
+      <span id="error-password" class="error"></span>
+    </fieldset>
+    <fieldset>
+      <label for="mailAddress"><strong>Mail Address</strong></label>
+      <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+      <span id="error-mailAddress" class="error"></span>
+    </fieldset>
+    <fieldset>
+      <label for="url"><strong>URL (Optional)</strong></label>
+      <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+      <span id="error-url" class="error"></span>
+    </fieldset>
+    <fieldset>
+      @if(account.isDefined){
+        <input type="submit" class="btn btn-success" value="Save"/>
+        <a href="@url(account.get.userName)" class="btn">Cancel</a>
+      } else {
+        <input type="submit" class="btn btn-success" value="Create account"/>
+      }
+    </fieldset>
+  </form>
+}
diff --git a/src/main/twirl/account/info.scala.html b/src/main/twirl/account/info.scala.html
new file mode 100644
index 0000000..3905da2
--- /dev/null
+++ b/src/main/twirl/account/info.scala.html
@@ -0,0 +1,49 @@
+@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(account.userName){
+  <div class="container-fluid">
+    <div class="row-fluid">
+      <div class="span4">
+        <div class="block">
+          <div class="block-header">@account.userName</div>
+        </div>
+        <div class="block">
+          <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
+          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+        </div>
+      </div>
+      <div class="span8">
+        <ul class="nav nav-tabs">
+          <li class="active"><a href="#">Repositories</a></li>
+          <!--
+          <li><a href="#">Activity</a></li>
+          -->
+          @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
+          <li class="pull-right">
+            <div class="button-group">
+              <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
+            </div>
+          </li>
+          }
+        </ul>
+        @repositories.map { repository =>
+        <div class="block">
+          <div class="block-header">
+            <a href="@url(repository.owner)">@repository.owner</a>
+            /
+            <a href="@url(repository)">@repository.name</a>
+            @if(repository.repository.isPrivate){
+              <i class="icon-lock"></i>
+            }
+          </div>
+          @if(repository.repository.description.isDefined){
+            <div>@repository.repository.description</div>
+          }
+          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
+        </div>
+        }
+      </div>
+    </div>
+  </div>
+}
diff --git a/src/main/twirl/account/useredit.scala.html b/src/main/twirl/account/useredit.scala.html
deleted file mode 100644
index 4b8bf47..0000000
--- a/src/main/twirl/account/useredit.scala.html
+++ /dev/null
@@ -1,46 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){
-  @if(account.isDefined){
-    <h3>Edit your profile</h3>
-  } else {
-    <h3>Create your account</h3>
-  }
-  <form action="@if(account.isDefined){@url(account.get.userName)/_edit}else{/register}" method="POST" validate="true">
-    @if(account.isEmpty){
-      <fieldset>
-        <label for="userName"><strong>User name</strong></label>
-        <input type="text" name="userName" id="userName" value=""/>
-        <span id="error-userName" class="error"></span>
-      </fieldset>
-    }
-    <fieldset>
-      <label for="password"><strong>Password</strong>
-        @if(account.nonEmpty){
-          (Input to change password)
-        }
-      </label>
-      <input type="password" name="password" id="password" value=""/>
-      <span id="error-password" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="mailAddress"><strong>Mail Address</strong></label>
-      <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-      <span id="error-mailAddress" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="url"><strong>URL (Optional)</strong></label>
-      <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-      <span id="error-url" class="error"></span>
-    </fieldset>
-    <fieldset>
-      @if(account.isDefined){
-        <input type="submit" class="btn btn-success" value="Save"/>
-        <a href="@url(account.get.userName)" class="btn">Cancel</a>
-      } else {
-        <input type="submit" class="btn btn-success" value="Create account"/>
-      }
-    </fieldset>
-  </form>
-}
diff --git a/src/main/twirl/account/userinfo.scala.html b/src/main/twirl/account/userinfo.scala.html
deleted file mode 100644
index 3905da2..0000000
--- a/src/main/twirl/account/userinfo.scala.html
+++ /dev/null
@@ -1,49 +0,0 @@
-@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(account.userName){
-  <div class="container-fluid">
-    <div class="row-fluid">
-      <div class="span4">
-        <div class="block">
-          <div class="block-header">@account.userName</div>
-        </div>
-        <div class="block">
-          <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
-          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
-        </div>
-      </div>
-      <div class="span8">
-        <ul class="nav nav-tabs">
-          <li class="active"><a href="#">Repositories</a></li>
-          <!--
-          <li><a href="#">Activity</a></li>
-          -->
-          @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
-          <li class="pull-right">
-            <div class="button-group">
-              <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
-            </div>
-          </li>
-          }
-        </ul>
-        @repositories.map { repository =>
-        <div class="block">
-          <div class="block-header">
-            <a href="@url(repository.owner)">@repository.owner</a>
-            /
-            <a href="@url(repository)">@repository.name</a>
-            @if(repository.repository.isPrivate){
-              <i class="icon-lock"></i>
-            }
-          </div>
-          @if(repository.repository.description.isDefined){
-            <div>@repository.repository.description</div>
-          }
-          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
-        </div>
-        }
-      </div>
-    </div>
-  </div>
-}
diff --git a/src/main/twirl/issues/issues.scala.html b/src/main/twirl/issues/issues.scala.html
index eaf9bae..bafbce8 100644
--- a/src/main/twirl/issues/issues.scala.html
+++ b/src/main/twirl/issues/issues.scala.html
@@ -87,7 +87,7 @@
         <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
         <br/>
         <strong>New label</strong>
-        @labeledit(None, repository)
+        @_root_.issues.labels.html.edit(None, repository)
       }
     </div>
     <div class="span9">
diff --git a/src/main/twirl/issues/labeledit.scala.html b/src/main/twirl/issues/labeledit.scala.html
deleted file mode 100644
index 649c093..0000000
--- a/src/main/twirl/issues/labeledit.scala.html
+++ /dev/null
@@ -1,45 +0,0 @@
-@(label: Option[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@defining((if(label.isEmpty) ("new", 190, 4) else ("edit", 180, 8))){ case (mode, width, margin) =>
-<div id="@(mode)LabelArea">
-  <form method="POST" id="edit-label-form" validate="true" style="margin-bottom: 8px;"
-        action="@url(repository)/issues/label/@{if(mode == "new") "new" else label.get.labelId + "/edit"}">
-    <span id="error-@(mode)LabelName" class="error"></span>
-    <input type="text" name="@(mode)LabelName" id="@(mode)LabelName" style="width: @(width)px; margin-left: @(margin)px; margin-bottom: 0px;" value="@label.map(_.labelName)"@if(mode == "new"){ placeholder="New label name"}/>
-    <span id="error-@(mode)Color" class="error"></span>
-    <div class="input-append color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" id="@(mode)Color" style="width: @(width)px; margin-bottom: 0px;">
-      <input type="text" class="span3" name="@(mode)Color" value="#@label.map(_.color)" readonly style="width: @(width - 12)px; margin-left: @(margin)px;">
-      <span class="add-on"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
-    </div>
-    <input type="submit" class="btn" style="margin-left: @(margin)px; margin-bottom: 0px;" value="@if(mode == "new"){Create} else {Save}"/>
-    @if(mode == "edit"){
-      <input type="hidden" name="editLabelId" value="@label.map(_.labelId)"/>
-    }
-  </form>
-  <script>
-  $(function(){
-    @if(mode == "new"){
-      $('#newColor').colorpicker();
-    } else {
-      $('#editColor').colorpicker();
-
-      $('#edit-label-form').submit(function(e){
-        $.ajax($(this).attr('action'), {
-          type: 'POST',
-          data: $(this).serialize()
-        })
-        .done(function(data){
-          $('#label-edit').parent().empty().html(data);
-        })
-        .fail(function(data, status){
-          displayErrors($.parseJSON(data.responseText));
-        });
-
-        return false;
-      });
-    }
-  });
-  </script>
-</div>
-}
diff --git a/src/main/twirl/issues/labeleditlist.scala.html b/src/main/twirl/issues/labeleditlist.scala.html
deleted file mode 100644
index e62b0b6..0000000
--- a/src/main/twirl/issues/labeleditlist.scala.html
+++ /dev/null
@@ -1,47 +0,0 @@
-@(labels: List[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-<div id="label-edit">
-  <ul class="label-list nav nav-pills nav-stacked">
-    @labels.map { label =>
-    <li style="border: 1px solid white;">
-      <a href="javascript:void(0);" class="label-edit-link" data-label-id="@label.labelId">
-        <span class="count-right"><i class="icon-remove-circle"></i></span>
-        <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
-        @label.labelName
-      </a>
-    </li>
-    }
-  </ul>
-  <script>
-  $(function(){
-    $('i.icon-remove-circle').click(function(e){
-      e.stopPropagation();
-      if(confirm('Are you sure you want to delete this?')){
-        $.get('@url(repository)/issues/label/' + $(this).parents('a').data('label-id') + '/delete',
-          function(data){
-            $('#label-edit').parent().empty().html(data);
-          }
-        );
-      }
-    });
-
-    $('a.label-edit-link').click(function(e){
-      if($('input[name=editLabelId]').val() != $(this).data('label-id')){
-        $('#editLabelArea').remove();
-        var element = this;
-        $.get('@url(repository)/issues/label/' + $(this).data('label-id') + '/edit',
-          function(data){
-            $(element).parent().append(data);
-            $('div#label-edit li').css('border', '1px solid white');
-            $(element).parent().css('border', '1px solid #eee');
-          }
-        );
-      } else {
-        $('#editLabelArea').remove();
-        $('div#label-edit li').css('border', '1px solid white');
-      }
-    });
-  });
-  </script>
-</div>
diff --git a/src/main/twirl/issues/labels/edit.scala.html b/src/main/twirl/issues/labels/edit.scala.html
new file mode 100644
index 0000000..649c093
--- /dev/null
+++ b/src/main/twirl/issues/labels/edit.scala.html
@@ -0,0 +1,45 @@
+@(label: Option[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@defining((if(label.isEmpty) ("new", 190, 4) else ("edit", 180, 8))){ case (mode, width, margin) =>
+<div id="@(mode)LabelArea">
+  <form method="POST" id="edit-label-form" validate="true" style="margin-bottom: 8px;"
+        action="@url(repository)/issues/label/@{if(mode == "new") "new" else label.get.labelId + "/edit"}">
+    <span id="error-@(mode)LabelName" class="error"></span>
+    <input type="text" name="@(mode)LabelName" id="@(mode)LabelName" style="width: @(width)px; margin-left: @(margin)px; margin-bottom: 0px;" value="@label.map(_.labelName)"@if(mode == "new"){ placeholder="New label name"}/>
+    <span id="error-@(mode)Color" class="error"></span>
+    <div class="input-append color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" id="@(mode)Color" style="width: @(width)px; margin-bottom: 0px;">
+      <input type="text" class="span3" name="@(mode)Color" value="#@label.map(_.color)" readonly style="width: @(width - 12)px; margin-left: @(margin)px;">
+      <span class="add-on"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
+    </div>
+    <input type="submit" class="btn" style="margin-left: @(margin)px; margin-bottom: 0px;" value="@if(mode == "new"){Create} else {Save}"/>
+    @if(mode == "edit"){
+      <input type="hidden" name="editLabelId" value="@label.map(_.labelId)"/>
+    }
+  </form>
+  <script>
+  $(function(){
+    @if(mode == "new"){
+      $('#newColor').colorpicker();
+    } else {
+      $('#editColor').colorpicker();
+
+      $('#edit-label-form').submit(function(e){
+        $.ajax($(this).attr('action'), {
+          type: 'POST',
+          data: $(this).serialize()
+        })
+        .done(function(data){
+          $('#label-edit').parent().empty().html(data);
+        })
+        .fail(function(data, status){
+          displayErrors($.parseJSON(data.responseText));
+        });
+
+        return false;
+      });
+    }
+  });
+  </script>
+</div>
+}
diff --git a/src/main/twirl/issues/labels/editlist.scala.html b/src/main/twirl/issues/labels/editlist.scala.html
new file mode 100644
index 0000000..e62b0b6
--- /dev/null
+++ b/src/main/twirl/issues/labels/editlist.scala.html
@@ -0,0 +1,47 @@
+@(labels: List[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+<div id="label-edit">
+  <ul class="label-list nav nav-pills nav-stacked">
+    @labels.map { label =>
+    <li style="border: 1px solid white;">
+      <a href="javascript:void(0);" class="label-edit-link" data-label-id="@label.labelId">
+        <span class="count-right"><i class="icon-remove-circle"></i></span>
+        <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
+        @label.labelName
+      </a>
+    </li>
+    }
+  </ul>
+  <script>
+  $(function(){
+    $('i.icon-remove-circle').click(function(e){
+      e.stopPropagation();
+      if(confirm('Are you sure you want to delete this?')){
+        $.get('@url(repository)/issues/label/' + $(this).parents('a').data('label-id') + '/delete',
+          function(data){
+            $('#label-edit').parent().empty().html(data);
+          }
+        );
+      }
+    });
+
+    $('a.label-edit-link').click(function(e){
+      if($('input[name=editLabelId]').val() != $(this).data('label-id')){
+        $('#editLabelArea').remove();
+        var element = this;
+        $.get('@url(repository)/issues/label/' + $(this).data('label-id') + '/edit',
+          function(data){
+            $(element).parent().append(data);
+            $('div#label-edit li').css('border', '1px solid white');
+            $(element).parent().css('border', '1px solid #eee');
+          }
+        );
+      } else {
+        $('#editLabelArea').remove();
+        $('div#label-edit li').css('border', '1px solid white');
+      }
+    });
+  });
+  </script>
+</div>
diff --git a/src/main/twirl/issues/milestoneedit.scala.html b/src/main/twirl/issues/milestoneedit.scala.html
deleted file mode 100644
index 70bcae4..0000000
--- a/src/main/twirl/issues/milestoneedit.scala.html
+++ /dev/null
@@ -1,39 +0,0 @@
-@(milestone: Option[model.Milestone], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Milestones - " + repository.owner + "/" + repository.name){
-  @html.header("milestones", repository)
-  @issuestab("milestones", repository)
-  <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
-    <fieldset>
-      <label for="title"><string>Title</string></label>
-      <input type="text" id="title" name="title" style="width: 400px;" value="@milestone.map(_.title)"/>
-      <span id="error-title" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="description"><strong>Description</strong></label>
-      <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
-      <span id="error-description" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="dueDate"><strong>Due Date</strong></label>
-      @html.datepicker("dueDate", milestone.flatMap(_.dueDate))
-      <span id="error-dueDate" class="error"></span>
-    </fieldset>
-    <hr>
-    <div class="pull-right">
-      @if(milestone.isEmpty){
-        <input type="submit" class="btn" value="Create milestone"/>
-      } else {
-        @if(milestone.get.closedDate.isDefined){
-          <input type="button" class="btn" value="Open" id="open"
-                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/close';"/>
-        } else {
-          <input type="button" class="btn" value="Close" id="close"
-                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/open';"/>
-        }
-        <input type="submit" class="btn" value="Update milestone"/>
-      }
-    </div>
-  </form>
-}
diff --git a/src/main/twirl/issues/milestones.scala.html b/src/main/twirl/issues/milestones.scala.html
deleted file mode 100644
index 2d69642..0000000
--- a/src/main/twirl/issues/milestones.scala.html
+++ /dev/null
@@ -1,108 +0,0 @@
-@(state: String, milestones: List[(model.Milestone, Int, Int)], repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Milestones - " + repository.owner + "/" + repository.name){
-  @html.header("milestones", repository)
-  @issuestab("milestones", repository)
-  <div class="row-fluid">
-    <div class="span3">
-      <ul class="nav nav-pills nav-stacked">
-        <li@if(state == "open"){ class="active"}>
-          <a href="?state=open">
-            <span class="count-right">@milestones.filter(_._1.closedDate.isEmpty).size</span>
-            Open Milestones
-          </a>
-        </li>
-        <li@if(state == "closed"){ class="active"}>
-          <a href="?state=closed">
-            <span class="count-right">@milestones.filter(_._1.closedDate.isDefined).size</span>
-            Closed Milestones
-          </a>
-        </li>
-      </ul>
-      @if(isWritable){
-        <hr>
-        <a href="@url(repository)/issues/milestones/new" class="btn btn-block">Create a new milestone</a>
-      }
-    </div>
-    <div class="span9">
-      <table class="table table-bordered table-hover">
-        @defining(milestones.filter { case (milestone, _, _) =>
-          milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open")
-        }){ milestones =>
-          @milestones.map { case (milestone, openCount, closedCount) =>
-          <tr>
-            <td>
-              <div class="milestone row-fluid">
-                <div class="span4">
-                  <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a><br>
-                  @if(milestone.closedDate.isDefined){
-                    <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
-                  } else {
-                    @if(milestone.dueDate.isDefined){
-                      <span class="muted">Due in @date(milestone.dueDate.get)</span>
-                    } else {
-                      <span class="muted">No due date</span>
-                    }
-                  }
-                </div>
-                <div class="span8">
-                  <div class="milestone-menu">
-                    <div class="pull-right">
-                      @if(isWritable){
-                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit
-                        @if(milestone.closedDate.isDefined){
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a>
-                        } else {
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a>
-                        }
-                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/delete" class="delete">Delete</a>
-                      }
-                      <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open">Browse issues</a>
-                    </div>
-                    <span class="muted">@closedCount closed - @openCount open</span>
-                  </div>
-                  <div class="milestone-progress">
-                    @if(closedCount > 0){
-                      <span class="milestone-progress" style="width: @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%;"></span>
-                    }
-                    <span class="milestone-percentage">
-                    @if(closedCount == 0){
-                      0%
-                    } else {
-                      @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%
-                    }
-                    </span>
-                  </div>
-                </div>
-              </div>
-              @if(milestone.description.isDefined){
-                <div class="milestone-description">
-                  @markdown(milestone.description.get, repository, false, false, false)
-                </div>
-              }
-            </td>
-          </tr>
-          }
-          @if(milestones.isEmpty){
-          <tr>
-            <td style="padding: 20px; background-color: #eee; text-align: center;">
-              No milestones to show.
-              @if(isWritable){
-                <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
-              }
-            </td>
-          </tr>
-          }
-        }
-      </table>
-    </div>
-  </div>
-}
-<script>
-$(function(){
-  $('a.delete').click(function(){
-    return confirm('Once you delete this milestone, there is no going back.\nAre you sure?');
-  });
-});
-</script>
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
new file mode 100644
index 0000000..6c32f69
--- /dev/null
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -0,0 +1,39 @@
+@(milestone: Option[model.Milestone], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Milestones - " + repository.owner + "/" + repository.name){
+  @html.header("milestones", repository)
+  @issues.html.issuestab("milestones", repository)
+  <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
+    <fieldset>
+      <label for="title"><string>Title</string></label>
+      <input type="text" id="title" name="title" style="width: 400px;" value="@milestone.map(_.title)"/>
+      <span id="error-title" class="error"></span>
+    </fieldset>
+    <fieldset>
+      <label for="description"><strong>Description</strong></label>
+      <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
+      <span id="error-description" class="error"></span>
+    </fieldset>
+    <fieldset>
+      <label for="dueDate"><strong>Due Date</strong></label>
+      @html.datepicker("dueDate", milestone.flatMap(_.dueDate))
+      <span id="error-dueDate" class="error"></span>
+    </fieldset>
+    <hr>
+    <div class="pull-right">
+      @if(milestone.isEmpty){
+        <input type="submit" class="btn" value="Create milestone"/>
+      } else {
+        @if(milestone.get.closedDate.isDefined){
+          <input type="button" class="btn" value="Open" id="open"
+                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/close';"/>
+        } else {
+          <input type="button" class="btn" value="Close" id="close"
+                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/open';"/>
+        }
+        <input type="submit" class="btn" value="Update milestone"/>
+      }
+    </div>
+  </form>
+}
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
new file mode 100644
index 0000000..cce1f60
--- /dev/null
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -0,0 +1,108 @@
+@(state: String, milestones: List[(model.Milestone, Int, Int)], repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Milestones - " + repository.owner + "/" + repository.name){
+  @html.header("milestones", repository)
+  @issues.html.issuestab("milestones", repository)
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(state == "open"){ class="active"}>
+          <a href="?state=open">
+            <span class="count-right">@milestones.filter(_._1.closedDate.isEmpty).size</span>
+            Open Milestones
+          </a>
+        </li>
+        <li@if(state == "closed"){ class="active"}>
+          <a href="?state=closed">
+            <span class="count-right">@milestones.filter(_._1.closedDate.isDefined).size</span>
+            Closed Milestones
+          </a>
+        </li>
+      </ul>
+      @if(isWritable){
+        <hr>
+        <a href="@url(repository)/issues/milestones/new" class="btn btn-block">Create a new milestone</a>
+      }
+    </div>
+    <div class="span9">
+      <table class="table table-bordered table-hover">
+        @defining(milestones.filter { case (milestone, _, _) =>
+          milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open")
+        }){ milestones =>
+          @milestones.map { case (milestone, openCount, closedCount) =>
+          <tr>
+            <td>
+              <div class="milestone row-fluid">
+                <div class="span4">
+                  <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a><br>
+                  @if(milestone.closedDate.isDefined){
+                    <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
+                  } else {
+                    @if(milestone.dueDate.isDefined){
+                      <span class="muted">Due in @date(milestone.dueDate.get)</span>
+                    } else {
+                      <span class="muted">No due date</span>
+                    }
+                  }
+                </div>
+                <div class="span8">
+                  <div class="milestone-menu">
+                    <div class="pull-right">
+                      @if(isWritable){
+                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit
+                        @if(milestone.closedDate.isDefined){
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a>
+                        } else {
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a>
+                        }
+                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/delete" class="delete">Delete</a>
+                      }
+                      <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open">Browse issues</a>
+                    </div>
+                    <span class="muted">@closedCount closed - @openCount open</span>
+                  </div>
+                  <div class="milestone-progress">
+                    @if(closedCount > 0){
+                      <span class="milestone-progress" style="width: @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%;"></span>
+                    }
+                    <span class="milestone-percentage">
+                    @if(closedCount == 0){
+                      0%
+                    } else {
+                      @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%
+                    }
+                    </span>
+                  </div>
+                </div>
+              </div>
+              @if(milestone.description.isDefined){
+                <div class="milestone-description">
+                  @markdown(milestone.description.get, repository, false, false, false)
+                </div>
+              }
+            </td>
+          </tr>
+          }
+          @if(milestones.isEmpty){
+          <tr>
+            <td style="padding: 20px; background-color: #eee; text-align: center;">
+              No milestones to show.
+              @if(isWritable){
+                <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
+              }
+            </td>
+          </tr>
+          }
+        }
+      </table>
+    </div>
+  </div>
+}
+<script>
+$(function(){
+  $('a.delete').click(function(){
+    return confirm('Once you delete this milestone, there is no going back.\nAre you sure?');
+  });
+});
+</script>
diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html
new file mode 100644
index 0000000..7496e0f
--- /dev/null
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -0,0 +1,24 @@
+@(pageName: Option[String], diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@html.main("Compare Revisions - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
+  @tab("history", repository)
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+      @if(pageName.isDefined){
+        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Back to Page History</a>
+      } else {
+        <a class="btn" href="@url(repository)/wiki/_history">Back to Wiki History</a>
+      }
+      </div>
+    </li>
+  </ul>
+  @html.diff(diffs, repository, None)
+}
diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
new file mode 100644
index 0000000..3d302be
--- /dev/null
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -0,0 +1,36 @@
+@(pageName: String, page: Option[service.WikiService.WikiPageInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
+  @tab("", repository)
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+      @if(pageName != ""){
+        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+        <a class="btn" href="@url(repository)/wiki/@pageName/_delete" id="delete">Delete Page</a>
+        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
+      }
+      </div>
+    </li>
+  </ul>
+  <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
+    <span id="error-pageName" class="error"></span>
+    <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
+    @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
+    <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
+    <input type="hidden" name="currentPageName" value="@pageName"/>
+    <input type="submit" value="Save" class="btn btn-success">
+  </form>
+}
+<script>
+$(function(){
+  $('#delete').click(function(){
+    return confirm('Are you sure you want to delete this page?'); 
+  });
+});
+</script>
\ No newline at end of file
diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html
new file mode 100644
index 0000000..c00a1c8
--- /dev/null
+++ b/src/main/twirl/wiki/history.scala.html
@@ -0,0 +1,70 @@
+@(pageName: Option[String], commits: List[util.JGitUtil.CommitInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("History - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
+  @tab(if(pageName.isEmpty) "history" else "", repository)
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title">
+        @if(pageName.isEmpty){
+          <span class="muted">History</span>
+        } else {
+          <span class="muted">History for</span> @pageName.get
+        }
+      </h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+        @if(pageName.isEmpty){
+          @if(loginAccount.isDefined){
+            <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
+          }
+        } else {
+          <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+          @if(loginAccount.isDefined){
+            <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
+          }
+        }
+      </div>
+    </li>
+  </ul>
+  <table class="table table-bordered">
+    @commits.map { commit =>
+      <tr>
+        <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
+        <td><a href="@url(commit.committer)">@commit.committer</a></td>
+        <td width="80%">
+          <span class="muted">@datetime(commit.time):</span>
+          @commit.shortMessage
+        </td>
+      </tr>
+    }
+  </table>
+  <input type="button" id="compare" value="Compare Revisions" class="btn"/>
+  <input type="button" id="top" value="Back to Top" class="btn"/>
+  <script>
+  $(function(){
+    $('input[name=commitId]').click(function(){
+      return !($('input[name=commitId]:checked').length == 3);
+    });
+    
+    $('#compare').click(function(){
+      var e = $('input[name=commitId]:checked');
+      if(e.length == 2){
+        @if(pageName.isEmpty){
+          location.href = '@url(repository)/wiki/_compare/' +
+            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
+        } else {
+          location.href = '@url(repository)/wiki/@pageName.get/_compare/' +
+            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
+        }
+      }
+    });
+    
+    $('#top').click(function(){
+      $('html,body').animate({ scrollTop: 0 }, 'fast');
+    });
+  });
+  </script>
+}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html
new file mode 100644
index 0000000..9dae44a
--- /dev/null
+++ b/src/main/twirl/wiki/page.scala.html
@@ -0,0 +1,30 @@
+@(pageName: String, page: service.WikiService.WikiPageInfo, repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(pageName + " - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
+  @tab((if(pageName == "Home") "home" else ""), repository)
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title">@pageName</h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+        @if(isWritable){
+          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
+          <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
+        }
+        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
+      </div>
+    </li>
+  </ul>
+  <div class="markdown-body">
+    @markdown(page.content, repository, true, false, false)
+  </div>
+  <div class="small">
+    <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
+  </div>
+}
+<script>
+  $(function(){ prettyPrint(); });
+</script>
diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html
new file mode 100644
index 0000000..09e6113
--- /dev/null
+++ b/src/main/twirl/wiki/pages.scala.html
@@ -0,0 +1,25 @@
+@(pages: List[String], repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Pages - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
+  @tab("pages", repository)
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title"><span class="muted">Pages</span></h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+        @if(isWritable){
+          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
+        }
+      </div>
+    </li>
+  </ul>
+  <ul>
+    @pages.map { page =>
+      <li><a href="@url(repository)/wiki/@page">@page</a></li>
+    }
+  </ul>
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html
new file mode 100644
index 0000000..abca145
--- /dev/null
+++ b/src/main/twirl/wiki/tab.scala.html
@@ -0,0 +1,14 @@
+@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+<ul class="nav nav-tabs">
+  <li@if(active == "home"){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
+  <li@if(active == "pages"){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
+  <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
+  <li class="pull-right">
+    <div class="input-prepend">
+      <span class="add-on">HTTP</span>
+      <input type="text" value="@repository.url.replaceFirst("\\.git$", ".wiki.git")" readonly id="repository-url">
+    </div>
+  </li>
+</ul>
diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html
deleted file mode 100644
index 3c98b65..0000000
--- a/src/main/twirl/wiki/wiki.scala.html
+++ /dev/null
@@ -1,30 +0,0 @@
-@(pageName: String, page: service.WikiService.WikiPageInfo, repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(pageName + " - " + repository.owner + "/" + repository.name){
-  @html.header("wiki", repository)
-  @wikitab((if(pageName == "Home") "home" else ""), repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title">@pageName</h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(isWritable){
-          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-          <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
-        }
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
-      </div>
-    </li>
-  </ul>
-  <div class="markdown-body">
-    @markdown(page.content, repository, true, false, false)
-  </div>
-  <div class="small">
-    <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
-  </div>
-}
-<script>
-  $(function(){ prettyPrint(); });
-</script>
diff --git a/src/main/twirl/wiki/wikicompare.scala.html b/src/main/twirl/wiki/wikicompare.scala.html
deleted file mode 100644
index f6b29fb..0000000
--- a/src/main/twirl/wiki/wikicompare.scala.html
+++ /dev/null
@@ -1,24 +0,0 @@
-@(pageName: Option[String], diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@html.main("Compare Revisions - " + repository.owner + "/" + repository.name){
-  @html.header("wiki", repository)
-  @wikitab("history", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-      @if(pageName.isDefined){
-        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Back to Page History</a>
-      } else {
-        <a class="btn" href="@url(repository)/wiki/_history">Back to Wiki History</a>
-      }
-      </div>
-    </li>
-  </ul>
-  @html.diff(diffs, repository, None)
-}
diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html
deleted file mode 100644
index d6b657a..0000000
--- a/src/main/twirl/wiki/wikiedit.scala.html
+++ /dev/null
@@ -1,36 +0,0 @@
-@(pageName: String, page: Option[service.WikiService.WikiPageInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
-  @html.header("wiki", repository)
-  @wikitab("", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-      @if(pageName != ""){
-        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_delete" id="delete">Delete Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
-      }
-      </div>
-    </li>
-  </ul>
-  <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
-    <span id="error-pageName" class="error"></span>
-    <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
-    <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
-    <input type="hidden" name="currentPageName" value="@pageName"/>
-    <input type="submit" value="Save" class="btn btn-success">
-  </form>
-}
-<script>
-$(function(){
-  $('#delete').click(function(){
-    return confirm('Are you sure you want to delete this page?'); 
-  });
-});
-</script>
\ No newline at end of file
diff --git a/src/main/twirl/wiki/wikihistory.scala.html b/src/main/twirl/wiki/wikihistory.scala.html
deleted file mode 100644
index 093f58d..0000000
--- a/src/main/twirl/wiki/wikihistory.scala.html
+++ /dev/null
@@ -1,70 +0,0 @@
-@(pageName: Option[String], commits: List[util.JGitUtil.CommitInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("History - " + repository.owner + "/" + repository.name){
-  @html.header("wiki", repository)
-  @wikitab(if(pageName.isEmpty) "history" else "", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title">
-        @if(pageName.isEmpty){
-          <span class="muted">History</span>
-        } else {
-          <span class="muted">History for</span> @pageName.get
-        }
-      </h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(pageName.isEmpty){
-          @if(loginAccount.isDefined){
-            <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-          }
-        } else {
-          <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
-          @if(loginAccount.isDefined){
-            <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
-          }
-        }
-      </div>
-    </li>
-  </ul>
-  <table class="table table-bordered">
-    @commits.map { commit =>
-      <tr>
-        <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
-        <td><a href="@url(commit.committer)">@commit.committer</a></td>
-        <td width="80%">
-          <span class="muted">@datetime(commit.time):</span>
-          @commit.shortMessage
-        </td>
-      </tr>
-    }
-  </table>
-  <input type="button" id="compare" value="Compare Revisions" class="btn"/>
-  <input type="button" id="top" value="Back to Top" class="btn"/>
-  <script>
-  $(function(){
-    $('input[name=commitId]').click(function(){
-      return !($('input[name=commitId]:checked').length == 3);
-    });
-    
-    $('#compare').click(function(){
-      var e = $('input[name=commitId]:checked');
-      if(e.length == 2){
-        @if(pageName.isEmpty){
-          location.href = '@url(repository)/wiki/_compare/' +
-            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
-        } else {
-          location.href = '@url(repository)/wiki/@pageName.get/_compare/' +
-            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
-        }
-      }
-    });
-    
-    $('#top').click(function(){
-      $('html,body').animate({ scrollTop: 0 }, 'fast');
-    });
-  });
-  </script>
-}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/wikipages.scala.html b/src/main/twirl/wiki/wikipages.scala.html
deleted file mode 100644
index c827eb9..0000000
--- a/src/main/twirl/wiki/wikipages.scala.html
+++ /dev/null
@@ -1,25 +0,0 @@
-@(pages: List[String], repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Pages - " + repository.owner + "/" + repository.name){
-  @html.header("wiki", repository)
-  @wikitab("pages", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Pages</span></h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(isWritable){
-          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-        }
-      </div>
-    </li>
-  </ul>
-  <ul>
-    @pages.map { page =>
-      <li><a href="@url(repository)/wiki/@page">@page</a></li>
-    }
-  </ul>
-
-}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/wikitab.scala.html b/src/main/twirl/wiki/wikitab.scala.html
deleted file mode 100644
index abca145..0000000
--- a/src/main/twirl/wiki/wikitab.scala.html
+++ /dev/null
@@ -1,14 +0,0 @@
-@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-<ul class="nav nav-tabs">
-  <li@if(active == "home"){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
-  <li@if(active == "pages"){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
-  <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
-  <li class="pull-right">
-    <div class="input-prepend">
-      <span class="add-on">HTTP</span>
-      <input type="text" value="@repository.url.replaceFirst("\\.git$", ".wiki.git")" readonly id="repository-url">
-    </div>
-  </li>
-</ul>