diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index bfb3ead..a2c328e 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -2,12 +2,18 @@
 @import context._
 @import view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.menu("milestones", repository){
-    @issues.html.tab("milestones", false, repository)
+  @html.menu("issues", repository){
+    @if(milestone.isEmpty){
+      <h4>New milestone</h4>
+      <div class="muted">Create a new milestone to help organize your issues and pull requests.</div>
+    } else {
+      @issues.html.tab("milestones", false, repository)
+      <br><br>
+    }
+    <hr style="margin-top: 12px; margin-bottom: 18px;" class="fill-width"/>
     <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)"/>
+        <input type="text" id="title" name="title" style="width: 500px;" value="@milestone.map(_.title)" placeholder="Title"/>
         <span id="error-title" class="error"></span>
       </fieldset>
       <fieldset>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index d10a08f..8c62335 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -6,7 +6,7 @@
 @import view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @html.menu("issues", repository){
-    @issues.html.tab("milestones", false, repository)
+    @issues.html.tab("milestones", hasWritePermission, repository)
     <div class="row-fluid">
       <div class="span12">
         <table class="table table-bordered table-hover table-issues">
@@ -63,7 +63,7 @@
                       </div>
                       <div class="milestone-menu">
                         @if(hasWritePermission){
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit &nbsp;&nbsp;
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit</a> &nbsp;&nbsp;
                           @if(milestone.closedDate.isDefined){
                             <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a> &nbsp;&nbsp;
                           } else {
diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html
index 9aa14ba..ff68ff9 100644
--- a/src/main/twirl/issues/tab.scala.html
+++ b/src/main/twirl/issues/tab.scala.html
@@ -17,6 +17,11 @@
         @if(active == "pulls"){
           <a class="btn btn-small btn-success" href="@url(repository)/compare">New pull request</a>
         }
+        @if(active == "labels"){
+        }
+        @if(active == "milestones"){
+          <a class="btn btn-small btn-success" href="@url(repository)/issues/milestones/new">New milestone</a>
+        }
       }
     </div>
   </li>