diff --git a/public/themes/default/css/default.css b/public/themes/default/css/default.css
index 08d7f4a..4c5703c 100644
--- a/public/themes/default/css/default.css
+++ b/public/themes/default/css/default.css
@@ -4,7 +4,16 @@ body {
 }
 
 .user-panel {
-    margin-top: 9px;
+    margin-top: 16px;
+}
+
+.user-panel {
+	color: #fff;
+}
+
+.user-panel a {
+	color: #fff;
+	text-decoration: underline;
 }
 
 .error {
diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php
index b51d159..0459926 100644
--- a/public/themes/default/header.chunk.php
+++ b/public/themes/default/header.chunk.php
@@ -20,7 +20,7 @@
     <meta itemprop="name" content="<?php echo Site::title(); ?> | <?php echo Site::name(); ?>">
 
     <!-- Styles -->
-    <link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.min.css" type="text/css" />
+    <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.css" type="text/css" />
     <?php Stylesheet::add('public/themes/default/css/default.css', 'frontend', 2); ?>
     <?php Stylesheet::load(); ?>
 
@@ -38,23 +38,24 @@
 
   <body>
 
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="<?php echo Site::url(); ?>"><?php echo Site::name(); ?></a>
-          <div class="nav-collapse collapse">
-            <ul class="nav">
-                <?php echo Menu::get(); ?>
-            </ul>
-            <div class="pull-right user-panel">
-              <?php Users::getPanel(); ?>
-            </div>
-          </div><!--/.nav-collapse -->
+          </button>
+          <a class="navbar-brand" href="<?php echo Site::url(); ?>"><?php echo Site::name(); ?></a>
+        </div>
+        <div class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+              <?php echo Menu::get(); ?>
+          </ul>
+          <div class="pull-right user-panel">
+            <?php Users::getPanel(); ?>
+          </div>
         </div>
       </div>
-    </div>
+    </div>
\ No newline at end of file
diff --git a/public/themes/default/index.template.php b/public/themes/default/index.template.php
index e836717..431ef41 100644
--- a/public/themes/default/index.template.php
+++ b/public/themes/default/index.template.php
@@ -2,19 +2,19 @@
     <div class="container">
 
         <div class="row">
-            <div class="span12">
+            <div class="col-xs-12">
                 <?php Action::run('theme_pre_content'); ?>
             </div>
         </div>
 
         <div class="row">
-            <div class="span12">
+            <div class="col-xs-12">
                 <?php echo Site::content(); ?>
             </div>
         </div>
 
         <div class="row">
-            <div class="span12">
+            <div class="col-xs-12">
                 <?php Action::run('theme_post_content'); ?>
             </div>
         </div>
