diff --git a/public/css/styles.less b/public/css/styles.less
index aa1325c5a6..984b931c2a 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -1,9 +1,10 @@
+//@import "bootstrap/bootstrap";
+//@import "themes/ios7";
+
 body {
   padding-top: 80px;
 }
-//
-// TODO: Refactor
-//
+
 .navbar-nav img {
   width: 40px;
   height: 40px;
@@ -32,11 +33,10 @@ body {
 }
 
 .github {
+  color: #fff;
   background-color: #333;
   border-color: #333;
-
-
-}// TODO: REFACTOR
+}
 
 // Search field
 .dataTables_filter {
@@ -170,3 +170,7 @@ body {
   }
 }
 
+
+
+
+
diff --git a/public/css/themes/ios7.less b/public/css/themes/ios7.less
index 536f17c705..6af8a97c54 100644
--- a/public/css/themes/ios7.less
+++ b/public/css/themes/ios7.less
@@ -1,5 +1,4 @@
 // iOS 7 Bootstrap Theme
-// Sahat Yalkabov
 // -----------------------------------------------------
 
 // Variables  =================================================================
diff --git a/views/account.jade b/views/account.jade
index 351bdf5159..885adea68e 100644
--- a/views/account.jade
+++ b/views/account.jade
@@ -1,7 +1,6 @@
 extends layout
 
 block content
-  h2 Account Management
   ul.nav.nav-tabs
     li.active
       a(href='#basic', data-toggle='tab') Basic Info
@@ -10,6 +9,7 @@ block content
   .tab-content
     #basic.tab-pane.fade.active.in
       form.form-horizontal(action='/account/profile', method='POST')
+        legend Profile Information
         .form-group
           label.col-sm-2.control-label(for='name') Name
           .col-sm-4
@@ -40,9 +40,8 @@ block content
             button.btn.btn.btn-primary(type='submit') Update Profile
 
     #settings.tab-pane.fade
-      .page-header
-        h3 Change Password
       form.form-horizontal(action='/account/profile', method='POST')
+        legend Change Password
         .form-group
           label.col-sm-3.control-label(for='password') Password
           .col-sm-4
diff --git a/views/layout.jade b/views/layout.jade
index ee2013cb5d..d7fb314dc7 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -12,6 +12,7 @@ html
     link(href='/css/lib/animate.css', rel='stylesheet')
     link(href='/css/lib/jasny-bootstrap.css', rel='stylesheet')
     link(href='/css/lib/font-awesome.min.css', rel='stylesheet')
+    link(href='/css/lib/bootstrap.min.css', rel='stylesheet')
     link(href='/css/themes/flat-ui.min.css', rel='stylesheet')
     link(href='/css/styles.css', rel='stylesheet')
 
diff --git a/views/login.jade b/views/login.jade
index a76df481a1..84e2ee96ee 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -5,34 +5,30 @@ block content
     .alert.alert-danger
       strong= messages
 
-  form.form-horizontal(method='POST')
-    legend Login
-    .form-group
-      .col-sm-offset-2.col-sm-8
-        .btn-group.btn-group-justified.btn-group
-          a.btn.btn-primary.facebook(href='/auth/facebook')
+  .col-sm-8.col-sm-offset-2
+    form(method='POST')
+      legend Sign In
+      .form-group
+        .btn-group.btn-group-justified
+          a.btn.btn-sm.btn-primary.facebook(href='/auth/facebook')
             i.fa.fa-facebook
             | Facebook
-          a.btn.btn-info.twitter(href='/auth/twitter')
+          a.btn.btn-sm.btn-info.twitter(href='/auth/twitter')
             i.fa.fa-twitter
             | Twitter
-          a.btn.btn-default.github(href='/auth/github')
+          a.btn.btn-sm.btn-default.github(href='/auth/github')
             i.fa.fa-github
             | GitHub
-          a.btn.btn-danger.google(href='/auth/google')
+          a.btn.btn-sm.btn-danger.google(href='/auth/google')
             i.fa.fa-google-plus
             | Google
-    .form-group
-      label.col-sm-2.control-label(for='username') Email
-      .col-sm-8
+      .form-group
+        label.control-label(for='username') Email
         input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='')
-    .form-group
-      label.col-sm-2.control-label(for='username') Password
-      .col-sm-8
-        .input-group
-          input.form-control(type='password', name='password', id='password', placeholder='Password')
-          span.input-group-btn
-            button.btn.btn-default(type='submit') Go
+      .form-group
+        label.control-label(for='username') Password
+        input.form-control(type='password', name='password', id='password', placeholder='Password')
         .help-block
           a.pull-right(href='#') Forgot password?
-
+      .form-group
+        button.btn.btn-primary(type='submit') Login