diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html
index b74b90c..2b7d004 100644
--- a/src/main/twirl/issues/tab.scala.html
+++ b/src/main/twirl/issues/tab.scala.html
@@ -1,4 +1,5 @@
-@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(active: String, creationPage: Boolean,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <ul class="nav nav-pills pull-left fill-width" style="margin-bottom: 0px;">
@@ -9,10 +10,20 @@
   @if(loginAccount.isDefined){
   <li class="pull-right">
     <div class="btn-group">
-      @if(create){
-        <a class="btn btn-small btn-success" href="#" disabled="disabled">New Issue</a>
+      @if(creationPage){
+        @if(active == "issues"){
+          <a class="btn btn-small btn-success" href="#" disabled="disabled">New issue</a>
+        }
+        @if(active == "pulls"){
+          <a class="btn btn-small btn-success" href="#" disabled="disabled">New pull request</a>
+        }
       } else {
-        <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New Issue</a>
+        @if(active == "issues"){
+          <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New issue</a>
+        }
+        @if(active == "pulls"){
+          <a class="btn btn-small btn-success" href="@url(repository)/compare">New pull request</a>
+        }
       }
     </div>
   </li>
diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html
index 010ec25..fde7f88 100644
--- a/src/main/twirl/pulls/listparts.scala.html
+++ b/src/main/twirl/pulls/listparts.scala.html
@@ -12,16 +12,6 @@
 @import view.helpers._
 @import service.IssuesService.IssueInfo
 @*
-@repository.map { repository =>
-  @if(hasWritePermission){
-    <div class="pull-right">
-      @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL)
-      <a href="@url(repository)/compare" class="btn btn-small btn-success">New pull request</a>
-    </div>
-  }
-}
-*@
-@*
 <div class="btn-group">
   <a class="btn btn-small@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
   <a class="btn btn-small@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>