diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala
index 97af6cd..503ae60 100644
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -227,7 +227,7 @@
     milestoneId("milestoneId").map { milestoneId =>
       getMilestonesWithIssueCount(repository.owner, repository.name)
           .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
-        issues.milestones.html.progress(openCount + closeCount, closeCount, false)
+        issues.milestones.html.progress(openCount + closeCount, closeCount)
       } getOrElse NotFound
     } getOrElse Ok()
   })
diff --git a/src/main/twirl/issues/issuedetail.scala.html b/src/main/twirl/issues/issuedetail.scala.html
index ac9101e..63cfb63 100644
--- a/src/main/twirl/issues/issuedetail.scala.html
+++ b/src/main/twirl/issues/issuedetail.scala.html
@@ -47,7 +47,7 @@
         <div id="milestone-progress-area">
           @issue.milestoneId.map { milestoneId =>
             @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
-              @issues.milestones.html.progress(openCount + closeCount, closeCount, false)
+              @issues.milestones.html.progress(openCount + closeCount, closeCount)
             }
           }
         </div>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index 0941701..ba7def7 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -8,68 +8,71 @@
   @html.menu("issues", repository){
     @issues.html.tab("milestones", false, 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(hasWritePermission){
-          <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">
+      <div class="span12">
+        <table class="table table-bordered table-hover table-issues">
+          <tr>
+            <th style="background-color: #eee;">
+              <span class="small">
+                <a class="button-link@if(state == "open"){ selected}" href="?state=open">
+                  <img src="@assets/common/images/status-open@(if(state == "open"){"-active"}).png"/>
+                  @milestones.filter(_._1.closedDate.isEmpty).size Open
+                </a>&nbsp;&nbsp;
+                <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
+                  <img src="@assets/common/images/status-closed@(if(state == "closed"){"-active"}).png"/>
+                  @milestones.filter(_._1.closedDate.isDefined).size Closed
+                </a>
+              </span>
+            </th>
+          </tr>
           @defining(milestones.filter { case (milestone, _, _) =>
             milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open")
           }){ milestones =>
             @milestones.map { case (milestone, openCount, closedCount) =>
             <tr>
-              <td>
+              <td style="padding-top: 15px; padding-bottom: 15px;">
                 <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 {
-                      @milestone.dueDate.map { dueDate =>
-                        @if(isPast(dueDate)){
-                          <img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due in @date(dueDate)</span>
-                        } else {
-                          <span class="muted">Due in @date(dueDate)</span>
+                    <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a>
+                    <div style="margin-top: 6px">
+                      @if(milestone.closedDate.isDefined){
+                        <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
+                      } else {
+                        @milestone.dueDate.map { dueDate =>
+                          @if(isPast(dueDate)){
+                            <img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due in @date(dueDate)</span>
+                          } else {
+                            <span class="muted">Due in @date(dueDate)</span>
+                          }
+                        }.getOrElse {
+                          <span class="muted">No due date</span>
                         }
-                      }.getOrElse {
-                        <span class="muted">No due date</span>
                       }
-                    }
+                    </div>
                   </div>
                   <div class="span8">
-                    <div class="milestone-menu">
-                      <div class="pull-right">
+                    @progress(openCount + closedCount, closedCount)
+                    <div>
+                      <div>
+                        @if(closedCount == 0){
+                          0%
+                        } else {
+                          @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%
+                        } <span class="muted">complete</span> &nbsp;&nbsp;
+                        @openCount <span class="muted">open</span> &nbsp;&nbsp;
+                        @closedCount <span class="muted">closed</span>
+                      </div>
+                      <div class="milestone-menu">
                         @if(hasWritePermission){
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit &nbsp;&nbsp;
                           @if(milestone.closedDate.isDefined){
-                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a>
+                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a> &nbsp;&nbsp;
                           } else {
-                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a>
+                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a> &nbsp;&nbsp;
                           }
                           <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>
-                    @progress(openCount + closedCount, closedCount, true)
                   </div>
                 </div>
                 @if(milestone.description.isDefined){
diff --git a/src/main/twirl/issues/milestones/progress.scala.html b/src/main/twirl/issues/milestones/progress.scala.html
index b446688..d099190 100644
--- a/src/main/twirl/issues/milestones/progress.scala.html
+++ b/src/main/twirl/issues/milestones/progress.scala.html
@@ -1,15 +1,6 @@
-@(total: Int, progress: Int, showPercentage: Boolean)
+@(total: Int, progress: Int)
 <div class="milestone-progress">
   @if(progress > 0){
     <span class="milestone-progress" style="width: @((progress.toDouble / total.toDouble * 100).toInt)%;"></span>
   }
-  @if(showPercentage){
-    <span class="milestone-percentage">
-      @if(progress == 0){
-        0%
-      } else {
-        @((progress.toDouble / total.toDouble * 100).toInt)%
-      }
-    </span>
-  }
 </div>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 21431e0..6cb553b 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -688,8 +688,7 @@
 }
 
 a.milestone-title {
-  font-size: 120%;
-  font-weight: bold;
+  font-size: 180%;
 }
 
 div.milestone-description {
@@ -697,13 +696,12 @@
   color: #666;
 }
 
-div.milestone-menu {
-  font-size: 80%;
+a.milestone-title {
+  color: #333;
 }
 
-div.milestone-menu a {
-  margin-left: 8px;
-  font-weight: bold;
+div.milestone-menu {
+ margin-top: 8px;
 }
 
 div.milestone-menu a.delete {
@@ -742,11 +740,6 @@
   -moz-border-radius: 4px;
 }
 
-span.milestone-percentage {
-  position: absolute;
-  padding-left: 8px;
-}
-
 div.issue-header {
   padding-left: 8px;
   padding-right: 8px;