diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index ba8915e..8546c6a 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -5,11 +5,11 @@
 @import gitbucket.core.view.helpers._
 @html.main("Applications"){
 <div class="container">
-  <div class="row-fluid">
-    <div class="span3">
+  <div class="row">
+    <div class="col-md-3">
       @menu("application", settings.ssh)
     </div>
-    <div class="span9">
+    <div class="col-md-9">
       <div class="box">
         <div class="box-header">Personal access tokens</div>
         <div class="box-content">
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index c49d482..99a41bc 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -15,8 +15,8 @@
       <div class="box">
         <div class="box-header">Profile</div>
         <div class="box-content">
-          <div class="row-fluid">
-            <div class="span6">
+          <div class="row">
+            <div class="coil-md-6">
               @if(account.password.nonEmpty){
                 <fieldset>
                   <label for="password" class="strong">
@@ -42,7 +42,7 @@
                 <span id="error-url" class="error"></span>
               </fieldset>
             </div>
-            <div class="span6">
+            <div class="col-md-6">
               <fieldset>
                 <label for="avatar" class="strong">Image (optional):</label>
                 @helper.html.uploadavatar(Some(account))
diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
index 921beb2..9eb76c6 100644
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -4,8 +4,8 @@
 @html.main(if(account.isEmpty) "Create group" else "Edit group"){
 <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">
+      <div class="row">
+        <div class="col-md-5">
           <fieldset>
             <label for="groupName" class="strong">Group name</label>
             <div>
@@ -25,7 +25,7 @@
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
-        <div class="span7">
+        <div class="col-md-7">
           <fieldset>
             <label class="strong">Members</label>
             <ul id="member-list" class="collaborator">
diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html
index 22e9c28..2a3d44f 100644
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -5,8 +5,8 @@
 @html.main(account.userName){
   <div class="container">
     <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span4">
+      <div class="row">
+        <div class="col-md-4">
           <div class="block">
             <div class="account-image">@avatar(account.userName, 270)</div>
             <div class="account-fullname">@account.fullName</div>
@@ -28,7 +28,7 @@
           }
 
         </div>
-        <div class="span8">
+        <div class="col-md-8">
           <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){
diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html
index 507b5cf..07e798a 100644
--- a/src/main/twirl/gitbucket/core/account/register.scala.html
+++ b/src/main/twirl/gitbucket/core/account/register.scala.html
@@ -5,8 +5,8 @@
 <div class="container">
   <h3>Create your account</h3>
   <form action="@path/register" method="POST" validate="true">
-    <div class="row-fluid">
-      <div class="span6">
+    <div class="row">
+      <div class="col-md-6">
         <fieldset>
           <label for="userName" class="strong">Username:</label>
           <input type="text" name="userName" id="userName" value="" autofocus/>
@@ -35,7 +35,7 @@
           <span id="error-url" class="error"></span>
         </fieldset>
       </div>
-      <div class="span6">
+      <div class="col-md-6">
         <fieldset>
           <label for="avatar" class="strong">Image (optional):</label>
           @helper.html.uploadavatar(None)
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index 7229082..0f4591c 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -4,11 +4,11 @@
 @import gitbucket.core.view.helpers._
 @html.main("SSH Keys"){
 <div class="container">
-  <div class="row-fluid">
-    <div class="span3">
+  <div class="row">
+    <div class="col-md-3">
       @menu("ssh", settings.ssh)
     </div>
-    <div class="span9">
+    <div class="col-md-9">
       <div class="box">
         <div class="box-header">SSH Keys</div>
         <div class="box-content">