diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css
index c1c3e73..048e2da 100644
--- a/admin/themes/default/css/default.css
+++ b/admin/themes/default/css/default.css
@@ -1,90 +1,107 @@
 /************************************
-  Monstra
-  styles.css
+Monstra
+styles.css
 *************************************
-  CONTENTS
-    1. GENERAL
-    2. HEADER
-    3. CONTENT
-    4. LEFT MENU
-    5. AUTHORIZATION
-    6. MEDIA QUERIES
+CONTENTS
+1. GENERAL
+2. HEADER
+3. CONTENT
+4. LEFT MENU
+5. AUTHORIZATION
+6. MEDIA QUERIES
 
 
 *************************************
-    1. GENERAL
+1. GENERAL
 *************************************/
 body {
-  padding-top: 60px;
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-  color: #333333;
-  background-color: #ffffff;
+  background: #FAFAFA;
 }
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0;
-  font-family: inherit;
-  font-weight: bold;
-  color: inherit;
-  text-rendering: optimizelegibility;
+
+.navbar-inverse {
+  background: #252525;
 }
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  color: #999999;
-}
-h1 {
-  font-size: 30px;
-  line-height: 36px;
-}
-h1 small {
-  font-size: 18px;
-}
-h2 {
+
+.navbar-brand {
   font-size: 24px;
-  line-height: 36px;
 }
-h2 small {
-  font-size: 18px;
+
+h1,h2,h3,h4,h5 {
+  color: #222;
 }
-h3 {
-  line-height: 27px;
-  font-size: 16px;
+
+td, th {
+    display: table-cell;
+    vertical-align: inherit!important;
 }
-h3 small {
-  font-size: 14px;
+
+.navbar-default {
+  border-radius: 0;
 }
-h4,
-h5,
-h6 {
-  line-height: 18px;
-}
-h4 {
-  font-size: 14px;
-}
-h4 small {
-  font-size: 12px;
-}
-h5 {
-  font-size: 12px;
-}
-h6 {
-  font-size: 11px;
-  color: #999999;
-  text-transform: uppercase;
+
+.tab-page {
+  background: #fff;
 }
 
+  /* Tabs */
+
+  .tab-pane > table {
+      margin-top:-20px;
+  }
+
+  .tab-pane > table {
+      border-top:none!important;
+  }
+
+  .tab-content {
+    overflow: visible;
+  }
+
+  .tab-page {
+      border-bottom: 1px solid #DDDDDD;
+      border-left: 1px solid #DDDDDD;
+      border-right: 1px solid #DDDDDD;
+      padding: 20px 10px 10px;
+  }
+
+  .small-grey-text {
+      color:#333;
+      font-size: 10px;
+  }
+
+  .small-grey-text:hover {
+      color:#000;
+  }
+
+  .small-white-text {
+      color:#fff;
+      font-size: 10px;
+  }
+
+  .small-white-text:hover {
+      color:#fdfdfd;
+  }
+
+  .error-none {display:none;}
+  .error-field {border:1px solid red!important;}
+  .container-fluid {padding-left:0px;}
+  img {max-width:none;}
+
+  a.btn-expand{
+    color: #333;
+    font-weight:bold; 
+    font-size:14px;  
+    text-decoration: none;
+    padding-left:4px;
+    padding-right:4px;
+  }
+
+  footer a , footer{
+    color:#333;
+    font-size:10px;
+  }
+
+
 /* Inputs */
 
 input[type=text]:focus,
@@ -116,6 +133,7 @@ table {
   line-height: 18px;
   text-align: left;
   border-top: 1px solid #dddddd;
+   background: #fff;
 }
 .table th {
   font-weight: bold;
@@ -220,6 +238,11 @@ table {
 
 .table-bordered th, .table-bordered td {
     border-left: none;
+    height: 50px;
+}
+
+.table-bordered > thead > tr {
+  height: 45px;
 }
 
 td, th {
@@ -227,285 +250,23 @@ td, th {
     vertical-align: inherit!important;
 }
 
-/* Buttons */
-
-.btn-toolbar {
-  margin:0;
+.table-bordered >thead>tr>th,
+.table-bordered >tbody>tr>th,
+.table-bordered >tfoot>tr>th,
+.table-bordered >thead>tr>td,
+.table-bordered >tbody>tr>td,
+.table-bordered >tfoot>tr>td
+{
+  border: 0; 
+  border-bottom: 1px solid #ccc;
 }
 
-.btn-group .btn {
-  margin-left: 5px;
+.markItUpHeader ul li {
+  padding: 5px; 
 }
 
-.btn-actions-default {
-  -webkit-border-top-left-radius: 4px!important;
-  -moz-border-radius-topleft: 4px!important;
-  border-top-left-radius: 4px!important;
-  -webkit-border-bottom-left-radius: 4px!important;
-  -moz-border-radius-bottomleft: 4px!important;
-  border-bottom-left-radius: 4px!important;
-}
-
-/* Tabs */
-
-.tab-pane > table {
-    margin-top:-20px;
-}
-
-.tab-pane > table {
-    border-top:none!important;
-}
-
-.tab-content {
-  overflow: visible;
-}
-
-.tab-page {
-    border-bottom: 1px solid #DDDDDD;
-    border-left: 1px solid #DDDDDD;
-    border-right: 1px solid #DDDDDD;
-    margin-top: -20px;
-    padding: 20px 10px 10px;
-}
-
-.small-grey-text {
-    color:#333;
-    font-size: 10px;
-}
-
-.small-grey-text:hover {
-    color:#000;
-}
-
-.small-white-text {
-    color:#fff;
-    font-size: 10px;
-}
-
-.small-white-text:hover {
-    color:#fdfdfd;
-}
-
-.error-none {display:none;}
-.error-field {border:1px solid red!important;}
-.container-fluid {padding-left:0px;}
-img {max-width:none;}
-
-a.btn-expand{
-  color: #333;
-  font-weight:bold; 
-  font-size:14px;  
-  text-decoration: none;
-  padding-left:4px;
-  padding-right:4px;
-}
-
-footer a , footer{
-  color:#333;
-  font-size:10px;
-}
-
-/**************************************
-    2. HEADER
-*************************************/
-.monstra-header {
-  top: 0;
-  left: 0;
-  right: 0;
-  margin-top:-60px;
-  position: relative;
-  z-index:999;
-}
-.monstra-header h3 a:hover, .monstra-header .brand:hover, .monstra-header ul .active > a {
-  color: #ffffff;
-  text-decoration: none;
-}
-.monstra-header h3 {
-  position: relative;
-}
-.monstra-header h3 a, .monstra-header .brand {
-  float: left;
-  display: block;  
-  padding-top:15px;
-  padding-left:10px;
-  margin-left: 0px;
-  color: #fdfdfd;
-  font-family: arial;
-  font-weight: 600;
-  line-height: 1;
-  font-size: 24px;
-  text-shadow: 0 1px 2px rgba(0,0,0,.5);
-  width:188px;
-}
-.monstra-header p {
-  margin: 0;
-  line-height: 60px;
-}
-
-.monstra-header-inner, .topbar .fill {
-  background-color: #ccc;
-  background: url('@theme_admin_url/img/noisy_grid_dark.png');
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-}
-
-/*************************************
-    3. CONTENT
-*************************************/
-.monstra-content {
-  padding-top:20px;
-}
-
-/*************************************
-    4. LEFT MENU
-*************************************/
-.monstra-menu-category-separator {
-    border: 0;
-    border-bottom: 1px solid #ccc;
-    margin-top:5px;
-    margin-bottom:8px;
-}
-
-.monstra-menu-sidebar {
-  background: url('@theme_admin_url/img/noisy_grid.png');
-  background-color:#ccc;
-  max-width:192px!important;
-  min-width:136px!important;
-  margin-bottom: 20px;
-  padding: 19px;
-  border-bottom:2px solid #ccc;
-  border-right:2px solid #ccc;
-}
-
-.monstra-menu-sidebar ul {
-    clear: both;
-    margin: 0; 
-    padding: 0;
-    font-family: 'lucida grande','Lucida Sans Unicode', Tahoma, sans-serif;
-}
-
-.monstra-menu-sidebar li {
-    list-style: none;
-    margin: 0 0 0 -22px;
-    padding: 0;   
-}
-
-.monstra-menu-sidebar li a {
-    width:97%;  
-    color: #333;
-    padding-left: 23px;
-    text-decoration: none;
-    display: inline-block;
-    height: 20px;
-    line-height: 20px;
-    text-shadow: 0 1px 0 #fff;
-    margin: 2px 0;    
-}
-
-.monstra-menu-sidebar li a.current {
-    color: #000;
-    padding-top:3px;
-    cursor: pointer;
-    display: inline-block;
-    background-color: #e6e6e6;
-    background-repeat: no-repeat;
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-    background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-    background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-    background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-    background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-    background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-    line-height: normal;
-    border: 1px solid #ccc;
-    border-bottom-color: #bbb;
-    border-right:2px solid #ccc;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-    -webkit-transition: 0.1s linear all;
-    -moz-transition: 0.1s linear all;
-    -ms-transition: 0.1s linear all;
-    -o-transition: 0.1s linear all;
-    transition: 0.1s linear all;
-    margin-left: 1px;
-}
-
-.monstra-menu-sidebar li a:hover {
-    color: #000;
-    background:#fff;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-/*************************************
-    5. AUTHORIZATION
-*************************************/
-.login-body {
-    background-color: #FBFBFB;
-}
-
-.form-signin {
-  max-width: 290px;
-  padding: 19px 29px 29px;
-  margin: 0 auto 20px;
-  background: none repeat scroll 0 0 #fff;
-  -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.15);
-     -moz-box-shadow: 0 1px 5px rgba(0,0,0,.15);
-          box-shadow: 0 1px 5px rgba(0,0,0,.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-
-
-/*************************************
-    6. MEDIA QUERIES
-*************************************/
-
-/* iPhone 4, iPhone5, Small Tablet, Tablet */
-@media (max-width: 800px) {
-
-    .monstra-header .btn-small {
-        padding: 0px 7px;
-    }
-
-    .monstra-menu-sidebar {
-        background: url('@theme_admin_url/img/noisy_grid.png');
-        background-color:#ccc;
-        max-width: 100%!important;
-        min-width: 100%!important;
-        margin-bottom: 20px;
-        padding: 19px;
-        border:2px solid #ccc;
-    }
-
-    .container-fluid {
-        padding: 0px;
-    }
-
-}
-
-/* Small Tablet(Landscape), Tablet(Portrait) */
-@media (min-width: 768px) and (max-width: 800px) {
-    .row-fluid .span10 {
-        -moz-box-sizing: border-box;
-        display: block;
-        width: 94%;
-    }
-
-    footer a, footer {
-        color: #333333;
-        font-size: 10px;
-        margin-right: 10px;
-    }
+.markItUpHeader ul .markItUpSeparator {
+  display: none;
 }
 
 /* iPhone 4 */
@@ -527,4 +288,8 @@ footer a , footer{
     #showImage {
         min-width: 298px!important;
     }
+}
+
+footer {
+  margin-top: 30px;
 }
\ No newline at end of file
diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php
index 6996586..63d72b2 100644
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -9,16 +9,15 @@
     <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
 
     <!-- Styles -->
-    <?php Stylesheet::add('public/assets/css/bootstrap.css', 'backend', 1); ?>
+    <link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.min.css" type="text/css" />
     <?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
     <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
-    <?php Stylesheet::add('public/assets/css/bootstrap-responsive.css', 'backend', 4); ?>
     <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
     <?php Stylesheet::load(); ?>
 
     <!-- JavaScripts -->
-    <?php Javascript::add('public/assets/js/jquery.js', 'backend', 1); ?>
-    <?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="<?php echo Site::url(); ?>public/assets/js/bootstrap.min.js"></script>
     <?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
     <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>
     <?php Javascript::add('admin/themes/default/js/default.js', 'backend', 5); ?>
@@ -26,94 +25,88 @@
 
     <?php Action::run('admin_header'); ?>
 
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-    <link rel="stylesheet" href="css/ie.css" type="text/css" media="screen" />
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
+  </head>
 
-</head>
-<body>
-
-    <!-- Block_topbar -->
-    <div class="monstra-header">
-        <div class="monstra-header-inner">
-            <div class="container-fluid">
-                <a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171"></a>
-                <p class="pull-right">
-                    <?php Navigation::draw('top', Navigation::TOP); ?>
-                </p>
-            </div>
-        </div>
-    </div>
-    <!-- /Block_topbar -->
-
-    <!-- Block_container -->
-    <div class="container-fluid">
-
-        <div class="row-fluid">
-
-            <!-- Block_sidebar -->
-
-            <div class="span2 monstra-menu-sidebar">
-
-                <div class="hidden-desktop">
-                    <select class="input-block-level" name="sections" id="sections">
-                        <?php
-                            Navigation::getDropdown('content');
-                            Navigation::getDropdown('extends');
-                            Navigation::getDropdown('system');
-                        ?>
-                    </select>
-                </div>
-
-                <div class="hidden-phone hidden-tablet">
-
-                    <h3><?php echo __('Content', 'pages'); ?></h3>
-                    <ul>
-                        <?php Navigation::draw('content'); ?>
-                    </ul>
-                    <div class="monstra-menu-category-separator"></div>
-                    <?php if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) { ?>
-                    <h3><?php echo __('Extends', 'system'); ?></h3>
-                    <ul>
-                       <?php Navigation::draw('extends'); ?>
-                    </ul>
-                    <div class="monstra-menu-category-separator"></div>
-                    <?php } ?>
-                    <h3><?php echo __('System', 'system'); ?></h3>
-                    <ul>
-                        <?php Navigation::draw('system'); ?>
-                    </ul>
-
-                </div>
-
-            </div>
-            <!-- /Block_sidebar -->
-
-            <!-- Block_content -->
-            <div class="span10 monstra-content">
-
-                <div id="update-monstra"></div>
-                <div><?php Action::run('admin_pre_template'); ?></div>
-                <div>
-                    <?php
-                        if ($plugin_admin_area) {
-                            if (is_callable(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main')) {
-                                call_user_func(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main');
-                            } else {
-                                echo '<div class="message-error">'.__('Plugin main admin function does not exist', 'system').'</div>';
-                            }
-                        } else {
-                            echo '<div class="message-error">'.__('Plugin does not exist', 'system').'</div>';
-                        }
-                    ?>
-                </div>
-                <div><?php Action::run('admin_post_template'); ?></div>
-
-            </div>
-            <!-- /Block_content -->
+  <body>
 
+    <nav class="navbar navbar-default navbar-inverse" role="navigation">
+      
+      <div class="container">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="#">MONSTRA</a>
+      </div>
+
+      <!-- Collect the nav links, forms, and other content for toggling -->
+      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      
+        <ul class="nav navbar-nav">          
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Content', 'pages'); ?> <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <?php Navigation::draw('content'); ?>
+            </ul>
+          </li>
+          <?php if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) { ?>               
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Extends', 'system'); ?> <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <?php Navigation::draw('extends'); ?>                      
+            </ul>
+          </li>
+          <?php } ?>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('System', 'system'); ?> <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <?php Navigation::draw('system'); ?>                       
+            </ul>
+          </li>
+        </ul>
+        <ul class="nav navbar-nav navbar-right">
+          <li><a href="<?php echo Site::url(); ?>" target="_blank">View Site</a></li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Awilum <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="#">Profile</a></li>              
+              <li><a href="#">Log Out</a></li>              
+            </ul>
+          </li>
+        </ul>
+        
+      </div>
+
+      </div>
+    </nav>
+
+    <div class="container">
+
+        <div id="update-monstra"></div>
+        <div><?php Action::run('admin_pre_template'); ?></div>
+        <div>
+            <?php
+                if ($plugin_admin_area) {
+                    if (is_callable(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main')) {
+                        call_user_func(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main');
+                    } else {
+                        echo '<div class="message-error">'.__('Plugin main admin function does not exist', 'system').'</div>';
+                    }
+                } else {
+                    echo '<div class="message-error">'.__('Plugin does not exist', 'system').'</div>';
+                }
+            ?>
         </div>
+        <div><?php Action::run('admin_post_template'); ?></div>
 
         <!-- Block_footer -->
         <footer>
@@ -130,7 +123,6 @@
         <!-- /Block_footer -->
 
     </div>
-    <!-- /Block_container -->
 
 </body>
 </html>