diff --git a/plugins/box/backup/views/backend/index.view.php b/plugins/box/backup/views/backend/index.view.php
index 5b2e9c8..a95db05 100755
--- a/plugins/box/backup/views/backend/index.view.php
+++ b/plugins/box/backup/views/backend/index.view.php
@@ -1,5 +1,5 @@
 <h2><?php echo __('Backups', 'backup'); ?></h2>
-<br />
+<br>
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
@@ -7,6 +7,7 @@
 $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});
 </script>
 
+<div>
 <?php
     echo (
         Form::open() .
@@ -14,10 +15,13 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
         Form::checkbox('add_storage_folder', null, true, array('disabled' => 'disabled')) . ' ' . __('storage', 'backup') . ' ' . Html::nbsp(2) .
         Form::checkbox('add_public_folder') . ' ' . __('public', 'backup') . ' ' . Html::nbsp(2) .
         Form::checkbox('add_plugins_folder') . ' ' . __('plugins', 'backup') . ' ' . Html::nbsp(2) .
-        Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn', 'data-loading-text' => __('Creating...', 'backup'))).
+        Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn btn-primary', 'data-loading-text' => __('Creating...', 'backup'))).
         Form::close()
     );
 ?>
+</div>
+
+<br>
 
 <!-- Backup_list -->
 <table class="table table-bordered">
@@ -40,7 +44,7 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
             <div class="pull-right">
             <?php echo Html::anchor(__('Delete', 'backup'),
                       'index.php?id=backup&delete_file='.$backup.'&token='.Security::token(),
-                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete backup: :backup', 'backup', array(':backup' => Date::format($name, 'F jS, Y - g:i A')))."')"));
+                       array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete backup: :backup', 'backup', array(':backup' => Date::format($name, 'F jS, Y - g:i A')))."')"));
             ?>
             </div>
         </td>
diff --git a/plugins/box/blocks/views/backend/add.view.php b/plugins/box/blocks/views/backend/add.view.php
index a6ddfb8..1828ccf 100644
--- a/plugins/box/blocks/views/backend/add.view.php
+++ b/plugins/box/blocks/views/backend/add.view.php
@@ -9,24 +9,24 @@
 
 <?php echo (Form::hidden('csrf', Security::token())); ?>
 
-    <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+<div class="form-group">
+  <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+  <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'form-control error-field' : 'form-control'))); ?>
+  <?php
+      if (isset($errors['blocks_empty_name'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_empty_name'].'</span>';
+      if (isset($errors['blocks_exists'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_exists'].'</span>';
+  ?>
+</div>
+<br>
 
-    <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
-
-    <?php
-        if (isset($errors['blocks_empty_name'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_empty_name'].'</span>';
-        if (isset($errors['blocks_exists'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_exists'].'</span>';
-    ?>
-
-<br /><br />
 <?php
 
     Action::run('admin_editor', array(Html::toText($content)));
 
     echo (
        Html::br().
-       Form::submit('add_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn')).Html::nbsp(2).
-       Form::submit('add_blocks', __('Save', 'blocks'), array('class' => 'btn')).
+       Form::submit('add_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+       Form::submit('add_blocks', __('Save', 'blocks'), array('class' => 'btn btn-default')).
        Form::close()
     );
 
diff --git a/plugins/box/blocks/views/backend/edit.view.php b/plugins/box/blocks/views/backend/edit.view.php
index 82da094..13ab4f6 100644
--- a/plugins/box/blocks/views/backend/edit.view.php
+++ b/plugins/box/blocks/views/backend/edit.view.php
@@ -1,5 +1,5 @@
 <h2><?php echo __('Edit Block', 'blocks'); ?></h2>
-<br />
+<br>
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
@@ -9,31 +9,29 @@
         if (isset($errors['blocks_empty_name']) or isset($errors['blocks_exists'])) $error_class = 'error'; else $error_class = '';
 
         echo (Form::open());
-
         echo (Form::hidden('csrf', Security::token()));
-
         echo (Form::hidden('blocks_old_name', Request::get('filename')));
 
 ?>
 
-    <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
-
-        <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
-
+        <div class="form-group">
+        <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+        <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'form-control error-field' : 'form-control'))); ?>
         <?php
             if (isset($errors['blocks_empty_name'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_empty_name'].'</span>';
             if (isset($errors['blocks_exists'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_exists'].'</span>';
         ?>
+        </div>
 
-<br /><br />
+<br>
 <?php
 
         Action::run('admin_editor', array(Html::toText($content)));
 
         echo (
            Html::br().
-           Form::submit('edit_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn default')).Html::nbsp(2).
-           Form::submit('edit_blocks', __('Save', 'blocks'), array('class' => 'btn default')). Html::nbsp().
+           Form::submit('edit_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+           Form::submit('edit_blocks', __('Save', 'blocks'), array('class' => 'btn btn-default')). Html::nbsp().
            Form::close()
         );
 
diff --git a/plugins/box/blocks/views/backend/index.view.php b/plugins/box/blocks/views/backend/index.view.php
index d210c06..6e0934d 100755
--- a/plugins/box/blocks/views/backend/index.view.php
+++ b/plugins/box/blocks/views/backend/index.view.php
@@ -1,15 +1,23 @@
-<h2><?php echo __('Blocks', 'blocks'); ?></h2>
-<br />
+<div>
+    <div class="pull-left">
+        <h2><?php echo __('Blocks', 'blocks'); ?></h2>
+    </div>
+    <div class="pull-right">
+        <br>
+        <?php
+            echo (
+                Html::anchor(__('Create New Block', 'blocks'), 'index.php?id=blocks&action=add_block', array('title' => __('Create New Block', 'blocks'), 'class' => 'btn btn-primary')). Html::nbsp(3)
+            );
+        ?>
+    </div>
+    <div class="clearfix"></div>
+</div>
+
+<br>
 
 <?php if(Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-<?php
-    echo (
-            Html::anchor(__('Create New Block', 'blocks'), 'index.php?id=blocks&action=add_block', array('title' => __('Create New Block', 'blocks'), 'class' => 'btn default btn-small')). Html::nbsp(3)
-        );
-?>
-
-<br /><br />
+<br>
 
 <!-- Blocks_list -->
 <table class="table table-bordered">
@@ -24,20 +32,21 @@
     <tr>
         <td><?php echo basename($block, '.block.html'); ?></td>
         <td>
-            <div class="pull-right">
-            <div class="btn-toolbar">
+            <div class="pull-right">            
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'blocks'), 'index.php?id=blocks&action=edit_block&filename='.basename($block, '.block.html'), array('class' => 'btn btn-actions btn-small')); ?>
-                    <a class="btn dropdown-toggle btn-actions btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
-                    <ul class="dropdown-menu">
+                    <?php echo Html::anchor(__('Edit', 'blocks'), 'index.php?id=blocks&action=edit_block&filename='.basename($block, '.block.html'), array('class' => 'btn btn-primary')); ?>
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                        <span class="sr-only">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu">
                         <li><?php echo Html::anchor(__('View Embed Code', 'blocks'), 'javascript:;', array('title' => __('View Embed Code', 'blocks'), 'onclick' => '$.monstra.blocks.showEmbedCodes("'.basename($block, '.block.html').'");')); ?></li>
                     </ul>
-                    <?php echo Html::anchor(__('Delete', 'blocks'),
-                              'index.php?id=blocks&action=delete_block&filename='.basename($block, '.block.html').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete block: :block', 'blocks', array(':block' => basename($block, '.block.html')))."')"));
-                    ?>
                 </div>
-            </div>
+                <?php echo Html::anchor(__('Delete', 'blocks'),
+                          'index.php?id=blocks&action=delete_block&filename='.basename($block, '.block.html').'&token='.Security::token(),
+                           array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete block: :block', 'blocks', array(':block' => basename($block, '.block.html')))."')"));
+                ?>            
             </div>
         </td>
     </tr>
diff --git a/plugins/box/pages/views/backend/add.view.php b/plugins/box/pages/views/backend/add.view.php
index eb12848..83a0779 100644
--- a/plugins/box/pages/views/backend/add.view.php
+++ b/plugins/box/pages/views/backend/add.view.php
@@ -1,5 +1,5 @@
 <h2><?php echo __('New Page', 'pages'); ?></h2>
-<br />
+<br>
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
@@ -18,98 +18,109 @@
 
 <div class="tab-content tab-page">
     <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
+        <div class="form-group">
         <?php
-            echo (
+            echo (                
                 Form::label('page_title', __('Title', 'pages')).
-                Form::input('page_title', $post_title, array('class' => (isset($errors['pages_empty_title'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))
+                Form::input('page_title', $post_title, array('class' => (isset($errors['pages_empty_title'])) ? 'form-control error-field' : 'form-control'))
             );
             if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
+        ?>            
+        </div>
+        <div class="form-group">
+        <?php
 
             echo (
-                Html::br(2).
                 Form::label('page_name', __('Name (slug)', 'pages')).
-                Form::input('page_name', $post_name, array('class' => (isset($errors['pages_empty_name'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))
+                Form::input('page_name', $post_name, array('class' => (isset($errors['pages_empty_name'])) ? 'form-control error-field' : 'form-control'))
             );
 
             if (isset($errors['pages_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_exists'].'</span>';
             if (isset($errors['pages_empty_name'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_name'].'</span>';
         ?>
+        </div>
 
     </div>
     <div class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
+        <div class="form-group">
         <?php
             echo (
                 Form::label('page_keywords', __('Keywords', 'pages')).
-                Form::input('page_keywords', $post_keywords, array('class' => 'input-xxlarge')).
-                Html::br(2).
-                Form::label('page_description', __('Description', 'pages')).
-                Form::textarea('page_description', $post_description, array('class' => 'input-xxlarge'))
+                Form::input('page_keywords', $post_keywords, array('class' => 'form-control'))
             );
         ?>
-
+        </div>
+        <div class="form-group">
+        <?php    
+            echo (            
+                Form::label('page_description', __('Description', 'pages')).
+                Form::textarea('page_description', $post_description, array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
         <?php
             echo (
-                Html::br(2).
                 Form::label('robots', __('Search Engines Robots', 'pages')).
+                Html::br(1).
                 'no Index'.Html::nbsp().Form::checkbox('robots_index', 'index', $post_robots_index).Html::nbsp(2).
                 'no Follow'.Html::nbsp().Form::checkbox('robots_follow', 'follow', $post_robots_follow)
             );
         ?>
+        </div>
     </div>
     <div class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
-        <div class="row-fluid">
-            <div class="span3">
+        <div class="form-group">
             <?php
                 echo (
                     Form::label('pages', __('Parent', 'pages')).
-                    Form::select('pages', $pages_array, $parent_page)
+                    Form::select('pages', $pages_array, $parent_page, array('class' => 'form-control'))
                 );
             ?>
-            </div>
-            <div class="span3">
+        </div>
+        <div class="form-group">
             <?php
                 echo (
                     Form::label('templates', __('Template', 'pages')).
-                    Form::select('templates', $templates_array, $post_template)
+                    Form::select('templates', $templates_array, $post_template, array('class' => 'form-control'))
                 );
             ?>
-            </div>
-            <div class="span3">
+        </div>
+        <div class="form-group">
             <?php
                 echo (
                     Form::label('status', __('Status', 'pages')).
-                    Form::select('status', $status_array, $post_status)
+                    Form::select('status', $status_array, $post_status, array('class' => 'form-control'))
                 );
             ?>
-            </div>
-            <div class="span3">
+        </div>
+        <div class="form-group">
             <?php
                 echo (
                     Form::label('access', __('Access', 'pages')).
-                    Form::select('access', $access_array, $post_access)
+                    Form::select('access', $access_array, $post_access, array('class' => 'form-control'))
                 );
             ?>
-            </div>
-        </div>
+        </div>            
     </div>
 </div>
 
-<br /><br />
+<br>
 
 <?php Action::run('admin_editor', array(Html::toText($post_content))); ?>
 
-<br />
+<br>
 
-<div class="row-fluid">
-    <div class="span6">
+<div class="row">
+    <div class="col-xs-6">
         <?php
             echo (
-                Form::submit('add_page_and_exit', __('Save and Exit', 'pages'), array('class' => 'btn')).Html::nbsp(2).
-                Form::submit('add_page', __('Save', 'pages'), array('class' => 'btn'))
+                Form::submit('add_page_and_exit', __('Save and Exit', 'pages'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+                Form::submit('add_page', __('Save', 'pages'), array('class' => 'btn btn-default'))
             );
         ?>
     </div>
-    <div class="span6">
+    <div class="col-xs-6">
         <div class="pull-right"><?php echo __('Published on', 'pages'); ?>: <?php echo Form::input('page_date', $date, array('class' => 'input-large')); ?></div>
         <?php echo Form::close(); ?>
     </div>
diff --git a/plugins/box/pages/views/backend/edit.view.php b/plugins/box/pages/views/backend/edit.view.php
index 3d9bd54..ec75ba7 100644
--- a/plugins/box/pages/views/backend/edit.view.php
+++ b/plugins/box/pages/views/backend/edit.view.php
@@ -1,5 +1,5 @@
 <h2><?php if (Request::get('name') == 'error404') { echo __('Edit 404 Page', 'pages'); } else { echo __('Edit Page', 'pages'); } ?></h2>
-<br />
+<br>
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
@@ -21,16 +21,20 @@
 
 <div class="tab-content tab-page">
     <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
+        <div class="form-group">
         <?php
             echo (
                 Form::label('page_title', __('Title', 'pages')).
-                Form::input('page_title', $title_to_edit, array('class' => (isset($errors['pages_empty_title'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))
+                Form::input('page_title', $title_to_edit, array('class' => (isset($errors['pages_empty_title'])) ? 'form-control error-field' : 'form-control'))
             );
             if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
+        ?>
+        </div>
+        <div class="form-group">
+        <?php            
 
             if (Request::get('name') !== 'error404') {
                 echo (
-                    Html::br(2).
                     Form::label('page_name', __('Name (slug)', 'pages'))
                 );
             }
@@ -39,58 +43,67 @@
                 echo Form::hidden('page_name', $slug_to_edit);
             } else {
                 echo (
-                    Form::input('page_name', $slug_to_edit, array('class' => (isset($errors['pages_empty_name'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))
+                    Form::input('page_name', $slug_to_edit, array('class' => (isset($errors['pages_empty_name'])) ? 'form-control error-field' : 'form-control'))
                 );
             }
 
             if (isset($errors['pages_empty_name'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_name'].'</span>';
             if (isset($errors['pages_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_exists'].'</span>';
         ?>
+        </div>
     </div>
     <div class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
-
+        <div class="form-group">
         <?php
             echo (
                 Form::label('page_keywords', __('Keywords', 'pages')).
-                Form::input('page_keywords', $keywords_to_edit, array('class' => 'input-xxlarge')).
-                Html::br(2).
-                Form::label('page_description', __('Description', 'pages')).
-                Form::textarea('page_description', $description_to_edit, array('class' => 'input-xxlarge'))
+                Form::input('page_keywords', $keywords_to_edit, array('class' => 'form-control'))
             );
-
-            echo (
-                Html::br(2).
+        ?>
+        </div>
+        <div class="form-group">
+        <?php
+            echo(
+                Form::label('page_description', __('Description', 'pages')).
+                Form::textarea('page_description', $description_to_edit, array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
+        <?php
+            echo (                
                 Form::label('robots', __('Search Engines Robots', 'pages')).
+                Html::br(1).
                 'no Index'.Html::nbsp().Form::checkbox('robots_index', 'index', $post_robots_index).Html::nbsp(2).
                 'no Follow'.Html::nbsp().Form::checkbox('robots_follow', 'follow', $post_robots_follow)
             );
         ?>
+        </div>
     </div>
-    <div class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
-        <div class="row-fluid">
+    <div class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">        
             <?php
                 if (Request::get('name') == 'error404') {
                     echo Form::hidden('pages', $parent_page);
                 } else {
             ?>
-            <div class="span3">
+            <div class="form-group">
             <?php
                 echo (
                     Form::label('pages', __('Parent', 'pages')).
-                    Form::select('pages', $pages_array, $parent_page)
+                    Form::select('pages', $pages_array, $parent_page, array('class' => 'form-control'))
                 );
             ?>
             </div>
             <?php } ?>
             <?php if (Request::get('name') != 'error404') { ?>
-                <div class="span3">
+                <div class="form-group">
             <?php } else { ?>
             <div>
             <?php } ?>
             <?php
                 echo (
                     Form::label('templates', __('Template', 'pages')).
-                    Form::select('templates', $templates_array, $template)
+                    Form::select('templates', $templates_array, $template, array('class' => 'form-control'))
                 );
             ?>
             </div>
@@ -99,11 +112,11 @@
                     echo Form::hidden('status', $status);
                 } else {
             ?>
-            <div class="span3">
+            <div class="form-group">
             <?php
                 echo (
                     Form::label('status', __('Status', 'pages')).
-                    Form::select('status', $status_array, $status)
+                    Form::select('status', $status_array, $status, array('class' => 'form-control'))
                 );
             ?>
             </div>
@@ -113,35 +126,34 @@
                     echo Form::hidden('access', $access);
                 } else {
             ?>
-            <div class="span3">
+            <div class="form-group">
             <?php
                 echo (
                     Form::label('access', __('Access', 'pages')).
-                    Form::select('access', $access_array, $access)
+                    Form::select('access', $access_array, $access, array('class' => 'form-control'))
                 );
             ?>
             </div>
-            <?php } ?>
-        </div>
+            <?php } ?>        
     </div>
 </div>
 
-<br /><br />
+<br>
 
 <?php Action::run('admin_editor', array(Html::toText($to_edit))); ?>
 
-<br />
+<br>
 
-<div class="row-fluid">
-    <div class="span6">
+<div class="row">
+    <div class="col-xs-6">
         <?php
             echo (
-                Form::submit('edit_page_and_exit', __('Save and Exit', 'pages'), array('class' => 'btn')).Html::nbsp(2).
-                Form::submit('edit_page', __('Save', 'pages'), array('class' => 'btn'))
+                Form::submit('edit_page_and_exit', __('Save and Exit', 'pages'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+                Form::submit('edit_page', __('Save', 'pages'), array('class' => 'btn btn-default'))
             );
         ?>
     </div>
-    <div class="span6">
+    <div class="col-xs-6">
         <div class="pull-right"><?php echo __('Published on', 'pages'); ?>: <?php echo Form::input('page_date', $date, array('class' => 'input-large')); ?></div>
         <?php echo Form::close(); ?>
     </div>
diff --git a/plugins/box/pages/views/backend/index.view.php b/plugins/box/pages/views/backend/index.view.php
index 5b1a0c1..0abf960 100755
--- a/plugins/box/pages/views/backend/index.view.php
+++ b/plugins/box/pages/views/backend/index.view.php
@@ -1,16 +1,25 @@
-<h2><?php echo __('Pages', 'pages'); ?></h2>
-<br />
+<div>
+    <div class="pull-left">
+        <h2><?php echo __('Pages', 'pages'); ?></h2>
+    </div>
+    <div class="pull-right">
+        <br>
+        <?php
+            echo (
+                Html::anchor(__('Create New Page', 'pages'), 'index.php?id=pages&action=add_page', array('title' => __('Create New Page', 'pages'), 'class' => 'btn btn-primary')). Html::nbsp(3).
+                Html::anchor(__('Edit 404 Page', 'pages'), 'index.php?id=pages&action=edit_page&name=error404', array('title' => __('Create New Page', 'pages'), 'class' => 'btn btn-default'))
+            );
+        ?>
+    </div>
+
+    <div class="clearfix"></div>
+</div>
+
+<br>
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-<?php
-    echo (
-            Html::anchor(__('Create New Page', 'pages'), 'index.php?id=pages&action=add_page', array('title' => __('Create New Page', 'pages'), 'class' => 'btn btn-small')). Html::nbsp(3).
-            Html::anchor(__('Edit 404 Page', 'pages'), 'index.php?id=pages&action=edit_page&name=error404', array('title' => __('Create New Page', 'pages'), 'class' => 'btn btn-small'))
-        );
-?>
-
-<br /><br />
+<br>
 
 <table class="table table-bordered">
     <thead>
@@ -69,35 +78,33 @@
         </td>
         <td>
             <div class="pull-right">
+
             <div class="btn-group">
-                <?php echo Html::anchor(__('Edit', 'pages'), 'index.php?id=pages&action=edit_page&name='.$page['slug'], array('class' => 'btn btn-small')); ?>
-                <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
-                <ul class="dropdown-menu">
+              <?php echo Html::anchor(__('Edit', 'pages'), 'index.php?id=pages&action=edit_page&name='.$page['slug'], array('class' => 'btn btn-primary')); ?>
+              <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+                <span class="sr-only">Toggle Dropdown</span>
+              </button>
+              <ul class="dropdown-menu" role="menu">
                     <?php if ($page['parent'] == '') { ?>
                         <li><a href="index.php?id=pages&action=add_page&parent_page=<?php echo $page['slug']; ?>" title="<?php echo __('Create New Page', 'pages'); ?>"><?php echo __('Add', 'pages'); ?></a></li>
                     <?php } ?>
                     <li><?php echo Html::anchor(__('Clone', 'pages'), 'index.php?id=pages&action=clone_page&name='.$page['slug'].'&token='.Security::token(), array('title' => __('Clone', 'pages'))); ?></li>
                     <li class="divider"></li>
-                    <li class="dropdown-submenu pull-left">
-                        <a href=""><?php echo __('Status', 'pages'); ?></a>
-                        <ul class="dropdown-menu">
-                           <li><a href="index.php?id=pages&action=update_status&slug=<?php echo $page['slug']; ?>&status=published&token=<?php echo Security::token(); ?>"><?php echo __('Published', 'pages'); ?> <?php if ($page['_status'] == 'published') { ?><i class="icon-ok"></i><?php } ?></a></li>
-                           <li><a href="index.php?id=pages&action=update_status&slug=<?php echo $page['slug']; ?>&status=draft&token=<?php echo Security::token(); ?>"><?php echo __('Draft', 'pages'); ?> <?php if ($page['_status'] == 'draft') { ?><i class="icon-ok"></i><?php } ?></a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown-submenu pull-left">
-                        <a href=""><?php echo __('Access', 'pages'); ?></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="index.php?id=pages&action=update_access&slug=<?php echo $page['slug']; ?>&access=public&token=<?php echo Security::token(); ?>"><?php echo __('Public', 'pages'); ?> <?php if ($page['_access'] == 'public') { ?><i class="icon-ok"></i><?php } ?></a></li>
-                            <li><a href="index.php?id=pages&action=update_access&slug=<?php echo $page['slug']; ?>&access=registered&token=<?php echo Security::token(); ?>"><?php echo __('Registered', 'pages'); ?> <?php if ($page['_access'] == 'registered') { ?><i class="icon-ok"></i><?php } ?></a></li>
-                        </ul>
-                    </li>
-                    </ul>
-                <?php echo Html::anchor(__('Delete', 'pages'),
-                           'index.php?id=pages&action=delete_page&name='.$page['slug'].'&token='.Security::token(),
-                           array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__("Delete page: :page", 'pages', array(':page' => Html::toText($page['title'])))."')"));
-                ?>
+                    <li class="dropdown-header"><?php echo __('Status', 'pages'); ?></li>
+                    <li><a href="index.php?id=pages&action=update_status&slug=<?php echo $page['slug']; ?>&status=published&token=<?php echo Security::token(); ?>"><?php echo __('Published', 'pages'); ?> <?php if ($page['_status'] == 'published') { ?><i class="glyphicon glyphicon-ok"></i><?php } ?></a></li>
+                    <li><a href="index.php?id=pages&action=update_status&slug=<?php echo $page['slug']; ?>&status=draft&token=<?php echo Security::token(); ?>"><?php echo __('Draft', 'pages'); ?> <?php if ($page['_status'] == 'draft') { ?><i class="glyphicon glyphicon-ok"></i><?php } ?></a></li>
+                    <li class="dropdown-header"><?php echo __('Access', 'pages'); ?></li>
+                    <li><a href="index.php?id=pages&action=update_access&slug=<?php echo $page['slug']; ?>&access=public&token=<?php echo Security::token(); ?>"><?php echo __('Public', 'pages'); ?> <?php if ($page['_access'] == 'public') { ?><i class="glyphicon glyphicon-ok"></i><?php } ?></a></li>
+                    <li><a href="index.php?id=pages&action=update_access&slug=<?php echo $page['slug']; ?>&access=registered&token=<?php echo Security::token(); ?>"><?php echo __('Registered', 'pages'); ?> <?php if ($page['_access'] == 'registered') { ?><i class="glyphicon glyphicon-ok"></i><?php } ?></a></li>
+              </ul>
             </div>
+
+            <?php echo Html::anchor(__('Delete', 'pages'),
+                       'index.php?id=pages&action=delete_page&name='.$page['slug'].'&token='.Security::token(),
+                       array('class' => 'btn btn-danger btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__("Delete page: :page", 'pages', array(':page' => Html::toText($page['title'])))."')"));
+            ?>
+
             </div>
         </td>
      </tr>
diff --git a/plugins/box/plugins/views/backend/index.view.php b/plugins/box/plugins/views/backend/index.view.php
index bc1d0b5..aefb132 100755
--- a/plugins/box/plugins/views/backend/index.view.php
+++ b/plugins/box/plugins/views/backend/index.view.php
@@ -43,7 +43,7 @@
                             <div class="pull-right">
                             <?php echo Html::anchor(__('Uninstall', 'plugins'),
                                        'index.php?id=plugins&delete_plugin='.$plugin['id'].'&token='.Security::token(),
-                                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin['title']))."')"));
+                                       array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin['title']))."')"));
                              ?>
                             </div>
                         </td>
@@ -82,10 +82,10 @@
                         </td>
                         <td>
                             <div class="pull-right">
-                            <?php echo Html::anchor(__('Install', 'plugins'), 'index.php?id=plugins&install='.$plug['plugin'].'&token='.Security::token(), array('class' => 'btn btn-small')); ?>
+                            <?php echo Html::anchor(__('Install', 'plugins'), 'index.php?id=plugins&install='.$plug['plugin'].'&token='.Security::token(), array('class' => 'btn btn-primary')); ?>
                             <?php echo Html::anchor(__('Delete', 'plugins'),
                                        'index.php?id=plugins&delete_plugin_from_server='.Text::lowercase(basename($plug['path'],'.manifest.xml')).'&token='.Security::token(),
-                                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin_xml->plugin_name))."')"));
+                                       array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin_xml->plugin_name))."')"));
                              ?>
                             </div>
                         </td>
diff --git a/plugins/box/system/views/backend/index.view.php b/plugins/box/system/views/backend/index.view.php
index 04a14d9..6856fec 100755
--- a/plugins/box/system/views/backend/index.view.php
+++ b/plugins/box/system/views/backend/index.view.php
@@ -1,63 +1,122 @@
-<!-- System -->
-
-<br />
-
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
-
-<?php echo Html::anchor(__('Create Sitemap', 'system'), 'index.php?id=system&sitemap=create&token='.Security::token(), array('class' => 'btn btn-small')).Html::nbsp(2); ?>
-<?php echo Html::anchor(__('Delete Temporary Files', 'system'), 'index.php?id=system&temporary_files=delete&token='.Security::token(), array('class' => 'btn btn-small')).Html::nbsp(2); ?>
+<?php echo Html::anchor(__('Create Sitemap', 'system'), 'index.php?id=system&sitemap=create&token='.Security::token(), array('class' => 'btn btn-primary')).Html::nbsp(2); ?>
+<?php echo Html::anchor(__('Delete Temporary Files', 'system'), 'index.php?id=system&temporary_files=delete&token='.Security::token(), array('class' => 'btn btn-primary')).Html::nbsp(2); ?>
 <?php if ('off' == Option::get('maintenance_status', 'system')) { ?>
-<?php echo Html::anchor(__('Maintenance Mode On', 'system'), 'index.php?id=system&maintenance=on&token='.Security::token(), array('class' => 'btn btn-small')); ?>
+<?php echo Html::anchor(__('Maintenance Mode On', 'system'), 'index.php?id=system&maintenance=on&token='.Security::token(), array('class' => 'btn btn-primary')); ?>
 <?php } else { ?>
-<?php echo Html::anchor(__('Maintenance Mode Off', 'system'), 'index.php?id=system&maintenance=off&token='.Security::token(), array('class' => 'btn btn-small btn-danger')); ?>
+<?php echo Html::anchor(__('Maintenance Mode Off', 'system'), 'index.php?id=system&maintenance=off&token='.Security::token(), array('class' => 'btn btn-danger')); ?>
 <?php } ?>
 <?php Action::run('admin_system_extra_buttons'); ?>
 
 <hr />
 
-<h2><?php echo __('Site Settings', 'system'); ?></h2>
-<br />
-<?php
-    echo (
-        Form::open().
-        Form::hidden('csrf', Security::token()).
-        Form::label('site_name', __('Site Name', 'system')).
-        Form::input('site_name', Option::get('sitename'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('site_description', __('Site Description', 'system')).
-        Form::textarea('site_description', Option::get('description'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('site_keywords', __('Site Keywords', 'system')).
-        Form::input('site_keywords', Option::get('keywords'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('site_slogan', __('Site Slogan', 'system')).
-        Form::input('site_slogan', Option::get('slogan'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('site_default_page', __('Default Page', 'system')).
-        Form::select('site_default_page', $pages_array, Option::get('defaultpage'), array('class' => 'input-xlarge')). Html::br(2)
-    );
-?>
+<div class="row">
+    <div class="col-md-6">
+        <h2><?php echo __('Site Settings', 'system'); ?></h2>
+        <br>
+        <?php
+            echo (
+                Form::open().
+                Form::hidden('csrf', Security::token())
+                );
+            ?>
+            <div class="form-group">
+            <?php
+                echo (
+                    Form::label('site_name', __('Site Name', 'system')).
+                    Form::input('site_name', Option::get('sitename'), array('class' => 'form-control'))
+                );
+            ?>
+            </div>
+            <div class="form-group">
+            <?php 
+                echo (
+                    Form::label('site_description', __('Site Description', 'system')).
+                    Form::textarea('site_description', Option::get('description'), array('class' => 'form-control'))
+                );
+            ?>
+            </div>
+            <div class="form-group">
+            <?php
+                echo (
+                    Form::label('site_keywords', __('Site Keywords', 'system')).
+                    Form::input('site_keywords', Option::get('keywords'), array('class' => 'form-control'))
+                );
+            ?>
+            </div>
+            <div class="form-group">
+            <?php
+                echo (
+                    Form::label('site_slogan', __('Site Slogan', 'system')).
+                    Form::input('site_slogan', Option::get('slogan'), array('class' => 'form-control'))
+                );
+            ?>
+            </div>
+            <div class="form-group">
+            <?php 
+                echo (
+                    Form::label('site_default_page', __('Default Page', 'system')).
+                    Form::select('site_default_page', $pages_array, Option::get('defaultpage'), array('class' => 'form-control'))
+                );
+            ?>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <h2><?php echo __('System Settings', 'system'); ?></h2>
+        <br>
+        <div class="form-group">
+        <?php
+            echo (
+                Form::label('system_url', __('Site Url', 'system')).
+                Form::input('system_url', Option::get('siteurl'), array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
+        <?php            
+            echo (
+                Form::label('system_timezone', __('Time zone', 'system')).
+                Form::select('system_timezone', Date::timezones(), Option::get('timezone'), array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
+        <?php
+            echo (
+                Form::label('system_language', __('Language', 'system')).
+                Form::select('system_language', $languages_array, Option::get('language'), array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
+        <?php
+            echo (
+                Form::label('system_email', __('Email', 'system')).
+                Form::input('system_email', Option::get('system_email'), array('class' => 'form-control'))
+            );
+        ?>
+        </div>
+        <div class="form-group">
+        <?php
+            echo (
+                Form::label('site_maintenance_message', __('Maintenance Mode', 'system')).
+                Form::textarea('site_maintenance_message', Html::toText(Option::get('maintenance_message')), array('class' => 'form-control', 'style' => 'height:160px;'))
+            );
+        ?>
+        </div>
+    </div>
+</div>    
 
-<h2><?php echo __('System Settings', 'system'); ?></h2>
-<br />
-<?php
-    echo (
-        Form::label('system_url', __('Site Url', 'system')).
-        Form::input('system_url', Option::get('siteurl'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('system_timezone', __('Time zone', 'system')).
-        Form::select('system_timezone', Date::timezones(), Option::get('timezone'), array('class' => 'input-xxlarge')). Html::br().
-        Form::label('system_language', __('Language', 'system')).
-        Form::select('system_language', $languages_array, Option::get('language'), array('class' => 'input-xlarge')). Html::br().
-        Form::label('system_email', __('Email', 'system')).
-        Form::input('system_email', Option::get('system_email'), array('class' => 'input-xlarge')). Html::br().
-        Form::label('site_maintenance_message', __('Maintenance Mode', 'system')).
-        Form::textarea('site_maintenance_message', Html::toText(Option::get('maintenance_message')), array('class' => 'input-xxlarge', 'style' => 'height:160px;')). Html::br(2)
-    );
-?>
-
-<?php
-    echo (
-        Form::submit('edit_settings', __('Save', 'system'), array('class' => 'btn')).
-        Form::close()
-    );
-?>
-<!-- /System -->
+<div class="row">
+    <div class="col-md-6">
+        <?php
+            echo (
+                Form::submit('edit_settings', __('Save', 'system'), array('class' => 'btn btn-primary')).
+                Form::close()
+            );
+        ?>   
+    </div> 
+</div>
 
 <?php
     // Custom code for this plugin
diff --git a/plugins/box/users/views/backend/add.view.php b/plugins/box/users/views/backend/add.view.php
index 193098a..c4e7949 100644
--- a/plugins/box/users/views/backend/add.view.php
+++ b/plugins/box/users/views/backend/add.view.php
@@ -5,34 +5,59 @@
     echo (
         Html::br().
         Form::open().
-        Form::hidden('csrf', Security::token()).
-        Form::label('login', __('Username', 'users')).
-        Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'input-xlarge error-field' : 'input-xlarge'))
-    );
+        Form::hidden('csrf', Security::token())
+        );
+    ?>
+ <div class="row">
+    <div class="col-md-6">
+    <div class="form-group">
+    <?php
+        echo (
+            Form::label('login', __('Username', 'users')).
+            Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'form-control error-field' : 'form-control'))
+        );
 
-    if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_this_user_alredy_exists'].'</span>';
-    if (isset($errors['users_empty_login'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_login'].'</span>';
+        if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_this_user_alredy_exists'].'</span>';
+        if (isset($errors['users_empty_login'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_login'].'</span>';
+    ?>
+    </div>
 
-    echo (
-        Form::label('password', __('Password', 'users')).
-        Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'input-xlarge error-field' : 'input-xlarge'))
-    );
+    <div class="form-group">
+    <?php 
+        echo (
+            Form::label('password', __('Password', 'users')).
+            Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'form-control error-field' : 'form-control'))
+        );
+        if (isset($errors['users_empty_password'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_password'].'</span>';
+    ?>
+    </div>
 
-    if (isset($errors['users_empty_password'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_password'].'</span>';
+    <div class="form-group">
+    <?php
 
-    echo (
-        Form::label('email', __('Email', 'users')).
-        Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'input-xlarge error-field' : 'input-xlarge'))
-    );
+        echo (
+            Form::label('email', __('Email', 'users')).
+            Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'form-control error-field' : 'form-control'))
+        );
 
-    if (isset($errors['users_this_email_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_email_alredy_exists'].'</span>';
-    if (isset($errors['users_empty_email'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_email'].'</span>';
-
-    echo(
-        Form::label('role', __('Role', 'users')).
-        Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), null, array('class' => 'input-xlarge')). Html::br(2).
-        Form::submit('register', __('Register', 'users'), array('class' => 'btn default')).
-        Form::close()
-    );
-?>
-<!-- /Users_add -->
+        if (isset($errors['users_this_email_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_email_alredy_exists'].'</span>';
+        if (isset($errors['users_empty_email'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_email'].'</span>';
+    ?>
+    </div>
+    <div class="form-group">
+    <?php
+        echo (
+            Form::label('role', __('Role', 'users')).
+            Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), null, array('class' => 'form-control'))
+        );
+    ?>
+    </div>
+    <?php
+        echo (
+            Form::submit('register', __('Register', 'users'), array('class' => 'btn btn-primary')).
+            Form::close()
+        );
+    ?>
+    </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugins/box/users/views/backend/index.view.php b/plugins/box/users/views/backend/index.view.php
index be800b5..285d877 100755
--- a/plugins/box/users/views/backend/index.view.php
+++ b/plugins/box/users/views/backend/index.view.php
@@ -3,7 +3,7 @@
 
 <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-<?php echo Html::anchor(__('Register New User', 'users'), 'index.php?id=users&action=add', array('title' => __('Register New User', 'users'), 'class' => 'btn default btn-small')); ?>
+<?php echo Html::anchor(__('Register New User', 'users'), 'index.php?id=users&action=add', array('title' => __('Register New User', 'users'), 'class' => 'btn btn-primary')); ?>
 
 <div class="pull-right">
 <?php echo Form::open(null, array('name' => 'users_frontend')); ?>
@@ -43,12 +43,12 @@
         </td>
         <td>
             <div class="pull-right">
-            <?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-small')); ?>
+            <?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-primary')); ?>
             <?php
                 if ((int)$user['id'] != (int)$_SESSION['user_id']) {
                     echo Html::anchor(__('Delete', 'users'),
                        'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
-                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
+                       array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
                 }
              ?>
              </div>