diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 95c5091..279011b 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -7,7 +7,8 @@
 @import view.helpers._
 @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab("", true, repository)
+    @tab("issues", false, repository)
+    <br/><br/><hr style="margin-bottom: 10px;">
     <form action="@url(repository)/issues/new" method="POST" validate="true">
     <div class="row-fluid">
       <div class="span9">
@@ -65,7 +66,7 @@
       </div>
       <div class="span3">
         @if(hasWritePermission){
-          <span class="strong">Add Labels</span>
+          <span class="strong">Labels</span>
           <div>
             <div id="label-list">
               <ul class="label-list nav nav-pills nav-stacked">
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 0033e14..7d18f93 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -10,7 +10,7 @@
 @import view.helpers._
 @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab("issues", false, repository)
+    @tab("issues", true, repository)
     <ul class="nav nav-tabs pull-left fill-width">
       <li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
       <li class="pull-right">Issue #@issue.issueId</li>
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index 4deecb7..63e9288 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -13,7 +13,7 @@
 @import view.helpers._
 @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab(target, false, repository)
+    @tab(target, true, repository)
     <div class="row-fluid">
       <div class="span12">
         @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html
index 2b7d004..9aa14ba 100644
--- a/src/main/twirl/issues/tab.scala.html
+++ b/src/main/twirl/issues/tab.scala.html
@@ -1,4 +1,4 @@
-@(active: String, creationPage: Boolean,
+@(active: String, newButton: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -10,14 +10,7 @@
   @if(loginAccount.isDefined){
   <li class="pull-right">
     <div class="btn-group">
-      @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 {
+      @if(newButton){
         @if(active == "issues"){
           <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New issue</a>
         }