diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index 9228888..5956ac8 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -14,11 +14,7 @@
 @html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu(target, repository){
     @tab(target, true, repository)
-    <div class="row-fluid">
-      <div class="span12">
-        @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
-      </div>
-    </div>
+    @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
     @if(hasWritePermission){
       <form id="batcheditForm" method="POST">
         <input type="hidden" name="value"/>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index 8c62335..0c3ae91 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -7,96 +7,92 @@
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @html.menu("issues", repository){
     @issues.html.tab("milestones", hasWritePermission, repository)
-    <div class="row-fluid">
-      <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/milestone@(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/milestone@(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 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>
-                    <div style="margin-top: 6px">
-                      @if(milestone.closedDate.isDefined){
-                        <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
+    <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/milestone@(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/milestone@(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 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>
+                <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 {
-                        @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>
-                        }
+                        <span class="muted">Due in @date(dueDate)</span>
                       }
-                    </div>
+                    }.getOrElse {
+                      <span class="muted">No due date</span>
+                    }
+                  }
+                </div>
+              </div>
+              <div class="span8">
+                @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="span8">
-                    @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> &nbsp;&nbsp;
-                          @if(milestone.closedDate.isDefined){
-                            <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> &nbsp;&nbsp;
-                          }
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/delete" class="delete">Delete</a>
-                        }
-                      </div>
-                    </div>
+                  <div class="milestone-menu">
+                    @if(hasWritePermission){
+                      <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 {
+                        <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>
+                    }
                   </div>
                 </div>
-                @if(milestone.description.isDefined){
-                  <div class="milestone-description">
-                    @markdown(milestone.description.get, repository, false, false)
-                  </div>
-                }
-              </td>
-            </tr>
+              </div>
+            </div>
+            @if(milestone.description.isDefined){
+              <div class="milestone-description">
+                @markdown(milestone.description.get, repository, false, false)
+              </div>
             }
-            @if(milestones.isEmpty){
-            <tr>
-              <td style="padding: 20px; background-color: #eee; text-align: center;">
-                No milestones to show.
-                @if(hasWritePermission){
-                  <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
-                }
-              </td>
-            </tr>
+          </td>
+        </tr>
+        }
+        @if(milestones.isEmpty){
+        <tr>
+          <td style="padding: 20px; background-color: #eee; text-align: center;">
+            No milestones to show.
+            @if(hasWritePermission){
+              <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
             }
-          }
-        </table>
-      </div>
-    </div>
+          </td>
+        </tr>
+        }
+      }
+    </table>
   }
 }
 <script>