diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index c02bcbe..d92c708 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -2,60 +2,62 @@
 @import context._
 @import view.helpers._
 @html.main("Edit your profile"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("profile", settings.ssh)
-  </div>
-  <div class="span9">
-    @helper.html.information(info)
-    <form action="@url(account.userName)/_edit" method="POST" validate="true">
-    <div class="box">
-      <div class="box-header">Profile</div>
-      <div class="box-content">
-        <div class="row-fluid">
-          <div class="span6">
-            @if(account.password.nonEmpty){
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("profile", settings.ssh)
+    </div>
+    <div class="span9">
+      @helper.html.information(info)
+      <form action="@url(account.userName)/_edit" method="POST" validate="true">
+      <div class="box">
+        <div class="box-header">Profile</div>
+        <div class="box-content">
+          <div class="row-fluid">
+            <div class="span6">
+              @if(account.password.nonEmpty){
+                <fieldset>
+                  <label for="password" class="strong">
+                    Password (input to change password):
+                  </label>
+                  <input type="password" name="password" id="password" value=""/>
+                  <span id="error-password" class="error"></span>
+                </fieldset>
+              }
               <fieldset>
-                <label for="password" class="strong">
-                  Password (input to change password):
-                </label>
-                <input type="password" name="password" id="password" value=""/>
-                <span id="error-password" class="error"></span>
+                <label for="fullName" class="strong">Full Name:</label>
+                <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
+                <span id="error-fullName" class="error"></span>
               </fieldset>
-            }
-            <fieldset>
-              <label for="fullName" class="strong">Full Name:</label>
-              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
-              <span id="error-fullName" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="mailAddress" class="strong">Mail Address:</label>
-              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
-              <span id="error-mailAddress" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="url" class="strong">URL (optional):</label>
-              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
-              <span id="error-url" class="error"></span>
-            </fieldset>
+              <fieldset>
+                <label for="mailAddress" class="strong">Mail Address:</label>
+                <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
+                <span id="error-mailAddress" class="error"></span>
+              </fieldset>
+              <fieldset>
+                <label for="url" class="strong">URL (optional):</label>
+                <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
+                <span id="error-url" class="error"></span>
+              </fieldset>
+            </div>
+            <div class="span6">
+              <fieldset>
+                <label for="avatar" class="strong">Image (optional):</label>
+                @helper.html.uploadavatar(Some(account))
+              </fieldset>
+            </div>
           </div>
-          <div class="span6">
-            <fieldset>
-              <label for="avatar" class="strong">Image (optional):</label>
-              @helper.html.uploadavatar(Some(account))
-            </fieldset>
+          <div style="margin-top: 20px;">
+            <div class="pull-right">
+              <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+            </div>
+            <input type="submit" class="btn btn-success" value="Save"/>
+            <a href="@url(account.userName)" class="btn">Cancel</a>
           </div>
         </div>
-        <div style="margin-top: 20px;">
-          <div class="pull-right">
-            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-          </div>
-          <input type="submit" class="btn btn-success" value="Save"/>
-          <a href="@url(account.userName)" class="btn">Cancel</a>
-        </div>
       </div>
-    </div>
-  </form>
+    </form>
+  </div>
 </div>
 }
 <script>
diff --git a/src/main/twirl/account/group.scala.html b/src/main/twirl/account/group.scala.html
index 4826352..f97b135 100644
--- a/src/main/twirl/account/group.scala.html
+++ b/src/main/twirl/account/group.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @import view.helpers._
 @html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div>
+<div class="container">
   <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
       <div class="row-fluid">
         <div class="span5">
diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html
index 6a16f51..4cc4d12 100644
--- a/src/main/twirl/account/main.scala.html
+++ b/src/main/twirl/account/main.scala.html
@@ -3,54 +3,56 @@
 @import context._
 @import view.helpers._
 @html.main(account.userName){
-  <div class="container-fluid">
-    <div class="row-fluid">
-      <div class="span4">
-        <div class="block">
-          <div class="account-image">@avatar(account.userName, 200)</div>
-          <div class="account-fullname">@account.fullName</div>
-          <div class="account-username">@account.userName</div>
-        </div>
-        <div class="block">
-          @if(account.url.isDefined){
-            <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
-          }
-          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
-        </div>
-        @if(groupNames.nonEmpty){
-          <div>
-            <div>Groups</div>
-            @groupNames.map { groupName =>
-              <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
-            }
+  <div class="container">
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span4">
+          <div class="block">
+            <div class="account-image">@avatar(account.userName, 200)</div>
+            <div class="account-fullname">@account.fullName</div>
+            <div class="account-username">@account.userName</div>
           </div>
-        }
+          <div class="block">
+            @if(account.url.isDefined){
+              <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
+            }
+            <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+          </div>
+          @if(groupNames.nonEmpty){
+            <div>
+              <div>Groups</div>
+              @groupNames.map { groupName =>
+                <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
+              }
+            </div>
+          }
 
-      </div>
-      <div class="span8">
-        <ul class="nav nav-tabs" style="margin-bottom: 5px;">
-          <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
-          @if(account.isGroupAccount){
-            <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
-          } else {
-            <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
-          }
-          @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
-            <li class="pull-right">
-              <div class="button-group">
-                <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
-              </div>
-            </li>
-          }
-          @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
-            <li class="pull-right">
-              <div class="button-group">
-                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
-              </div>
-            </li>
-          }
-        </ul>
-        @body
+        </div>
+        <div class="span8">
+          <ul class="nav nav-tabs" style="margin-bottom: 5px;">
+            <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
+            @if(account.isGroupAccount){
+              <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
+            } else {
+              <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
+            }
+            @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
+              <li class="pull-right">
+                <div class="button-group">
+                  <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
+                </div>
+              </li>
+            }
+            @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+              <li class="pull-right">
+                <div class="button-group">
+                  <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
+                </div>
+              </li>
+            }
+          </ul>
+          @body
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/main/twirl/account/register.scala.html b/src/main/twirl/account/register.scala.html
index 7bce2db..3883f50 100644
--- a/src/main/twirl/account/register.scala.html
+++ b/src/main/twirl/account/register.scala.html
@@ -2,6 +2,7 @@
 @import context._
 @import view.helpers._
 @html.main("Create your account"){
+<div class="container">
   <h3>Create your account</h3>
   <form action="@path/register" method="POST" validate="true">
     <div class="row-fluid">
@@ -45,4 +46,5 @@
       <input type="submit" class="btn btn-success" value="Create account"/>
     </fieldset>
   </form>
+</div>
 }
diff --git a/src/main/twirl/account/ssh.scala.html b/src/main/twirl/account/ssh.scala.html
index 8f37ace..100044e 100644
--- a/src/main/twirl/account/ssh.scala.html
+++ b/src/main/twirl/account/ssh.scala.html
@@ -2,44 +2,46 @@
 @import context._
 @import view.helpers._
 @html.main("SSH Keys"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("ssh", settings.ssh)
-  </div>
-  <div class="span9">
-    <div class="box">
-      <div class="box-header">SSH Keys</div>
-      <div class="box-content">
-        @if(sshKeys.isEmpty){
-          No keys
-        }
-        @sshKeys.zipWithIndex.map { case (key, i) =>
-          @if(i != 0){
-            <hr>
-          }
-          <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
-          <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
-        }
-      </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("ssh", settings.ssh)
     </div>
-    <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+    <div class="span9">
       <div class="box">
-        <div class="box-header">Add an SSH Key</div>
+        <div class="box-header">SSH Keys</div>
         <div class="box-content">
-          <fieldset>
-            <label for="title" class="strong">Title</label>
-            <div><span id="error-title" class="error"></span></div>
-            <input type="text" name="title" id="title" style="width: 400px;"/>
-          </fieldset>
-          <fieldset>
-            <label for="publicKey" class="strong">Key</label>
-            <div><span id="error-publicKey" class="error"></span></div>
-            <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
-          </fieldset>
-          <input type="submit" class="btn btn-success" value="Add"/>
+          @if(sshKeys.isEmpty){
+            No keys
+          }
+          @sshKeys.zipWithIndex.map { case (key, i) =>
+            @if(i != 0){
+              <hr>
+            }
+            <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
+            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
+          }
         </div>
       </div>
-    </form>
+      <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+        <div class="box">
+          <div class="box-header">Add an SSH Key</div>
+          <div class="box-content">
+            <fieldset>
+              <label for="title" class="strong">Title</label>
+              <div><span id="error-title" class="error"></span></div>
+              <input type="text" name="title" id="title" style="width: 400px;"/>
+            </fieldset>
+            <fieldset>
+              <label for="publicKey" class="strong">Key</label>
+              <div><span id="error-publicKey" class="error"></span></div>
+              <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
+            </fieldset>
+            <input type="submit" class="btn btn-success" value="Add"/>
+          </div>
+        </div>
+      </form>
+    </div>
   </div>
 </div>
 }
diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
index 8e366a7..09bc2de 100644
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -1,22 +1,24 @@
 @(active: String)(body: Html)(implicit context: app.Context)
 @import context._
-<div class="row-fluid">
-  <div class="span3">
-    <div class="box">
-      <ul class="nav nav-tabs nav-stacked side-menu">
-        <li@if(active=="users"){ class="active"}>
-          <a href="@path/admin/users">User Management</a>
-        </li>
-        <li@if(active=="system"){ class="active"}>
-          <a href="@path/admin/system">System Settings</a>
-        </li>
-        <li>
-          <a href="@path/console/login.jsp">H2 Console</a>
-        </li>
-     </ul>
-   </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      <div class="box">
+        <ul class="nav nav-tabs nav-stacked side-menu">
+          <li@if(active=="users"){ class="active"}>
+            <a href="@path/admin/users">User Management</a>
+          </li>
+          <li@if(active=="system"){ class="active"}>
+            <a href="@path/admin/system">System Settings</a>
+          </li>
+          <li>
+            <a href="@path/console/login.jsp">H2 Console</a>
+          </li>
+       </ul>
+     </div>
+    </div>
+    <div class="span9">
+      @body
+    </div>
   </div>
-  <div class="span9">
-    @body
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/main/twirl/dashboard/issues.scala.html b/src/main/twirl/dashboard/issues.scala.html
index 9ebdede..0329e46 100644
--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -8,41 +8,43 @@
 @import context._
 @import view.helpers._
 @html.main("Your Issues"){
-@dashboard.html.tab("issues")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "all"){ class="active"}>
-        <a href="@path/dashboard/issues/repos@condition.toURL">
-          <span class="count-right">@allCount</span>
-          In your repositories
-        </a>
-      </li>
-      <li@if(filter == "assigned"){ class="active"}>
-        <a href="@path/dashboard/issues/assigned@condition.toURL">
-          <span class="count-right">@assignedCount</span>
-          Assigned to you
-        </a>
-      </li>
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/issues/created_by@condition.toURL">
-          <span class="count-right">@createdByCount</span>
-          Created by you
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("issues")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "all"){ class="active"}>
+          <a href="@path/dashboard/issues/repos@condition.toURL">
+            <span class="count-right">@allCount</span>
+            In your repositories
+          </a>
+        </li>
+        <li@if(filter == "assigned"){ class="active"}>
+          <a href="@path/dashboard/issues/assigned@condition.toURL">
+            <span class="count-right">@assignedCount</span>
+            Assigned to you
+          </a>
+        </li>
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/issues/created_by@condition.toURL">
+            <span class="count-right">@createdByCount</span>
+            Created by you
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
   </div>
-  @listparts
 </div>
 }
diff --git a/src/main/twirl/dashboard/pulls.scala.html b/src/main/twirl/dashboard/pulls.scala.html
index 4ffc18f..b6c75f9 100644
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ b/src/main/twirl/dashboard/pulls.scala.html
@@ -6,35 +6,37 @@
 @import context._
 @import view.helpers._
 @html.main("Your Issues"){
-@dashboard.html.tab("pulls")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/owned@condition.toURL">
-          <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
-          Yours
-        </a>
-      </li>
-      <li@if(filter == "not_created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/public@condition.toURL">
-          <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
-          Public
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@path/dashboard/pulls/for/@owner/@name">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("pulls")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/owned@condition.toURL">
+            <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
+            Yours
+          </a>
+        </li>
+        <li@if(filter == "not_created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/public@condition.toURL">
+            <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
+            Public
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@path/dashboard/pulls/for/@owner/@name">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
   </div>
-  @listparts
 </div>
 }
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
index 9e352c0..be43432 100644
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -4,67 +4,68 @@
 @import context._
 @import view.helpers._
 @main("GitBucket"){
-@dashboard.html.tab()
-<div class="row-fluid">
-  <div class="span8">
-    @helper.html.activities(activities)
-  </div>
-  <div class="span4">
-    @if(loginAccount.isEmpty){
-      @signinform(settings)
-    } else {
-      <table class="table table-bordered">
-        <tr>
-          <th class="metal">
-            <div class="pull-right">
-              <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
-            </div>
-            Your repositories (@userRepositories.size)
-          </th>
-        </tr>
-        @if(userRepositories.isEmpty){
-          <tr>
-            <td>No repositories</td>
-          </tr>
+  <div class="container">
+    @dashboard.html.tab()
+    <div class="row-fluid">
+      <div class="span8">
+        @helper.html.activities(activities)
+      </div>
+      <div class="span4">
+        @if(loginAccount.isEmpty){
+          @signinform(settings)
         } else {
-          @userRepositories.map { repository =>
+          <table class="table table-bordered">
             <tr>
-              <td>
-                @helper.html.repositoryicon(repository, false)
-                @if(repository.owner == loginAccount.get.userName){
-                  <a href="@url(repository)"><span class="strong">@repository.name</span></a>
-                } else {
-                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-                }
-              </td>
+              <th class="metal">
+                <div class="pull-right">
+                  <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
+                </div>
+                Your repositories (@userRepositories.size)
+              </th>
             </tr>
-          }
+            @if(userRepositories.isEmpty){
+              <tr>
+                <td>No repositories</td>
+              </tr>
+            } else {
+              @userRepositories.map { repository =>
+                <tr>
+                  <td>
+                    @helper.html.repositoryicon(repository, false)
+                    @if(repository.owner == loginAccount.get.userName){
+                      <a href="@url(repository)"><span class="strong">@repository.name</span></a>
+                    } else {
+                      <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+                    }
+                  </td>
+                </tr>
+              }
+            }
+          </table>
         }
-      </table>
-    }
-    
-    <table class="table table-bordered">
-      <tr>
-        <th class="metal">
-          Recent updated repositories
-        </th>
-      </tr>
-      @if(recentRepositories.isEmpty){2
-        <tr>
-          <td>No repositories</td>
-        </tr>
-      } else {
-        @recentRepositories.map { repository =>
-          <tr>
-            <td>
-              @helper.html.repositoryicon(repository, false)
-              <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-            </td>
-          </tr>
-        }
-      }
-    </table>
-  </div>
 
-</div>
-}
\ No newline at end of file
+        <table class="table table-bordered">
+          <tr>
+            <th class="metal">
+              Recent updated repositories
+            </th>
+          </tr>
+          @if(recentRepositories.isEmpty){2
+            <tr>
+              <td>No repositories</td>
+            </tr>
+          } else {
+            @recentRepositories.map { repository =>
+              <tr>
+                <td>
+                  @helper.html.repositoryicon(repository, false)
+                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+                </td>
+              </tr>
+            }
+          }
+        </table>
+      </div>
+    </div>
+  </div>
+}