diff --git a/plugins/box/menu/views/backend/add.view.php b/plugins/box/menu/views/backend/add.view.php
index 6abccf3..f5dbff1 100644
--- a/plugins/box/menu/views/backend/add.view.php
+++ b/plugins/box/menu/views/backend/add.view.php
@@ -10,22 +10,21 @@
 <a href="javascript:;" style="text-decoration:none; color:#333; border-bottom:1px dashed #333;" data-toggle="modal" onclick="$('#selectPageModal').modal('show').width(270);" ><?php echo __('Select page', 'menu'); ?></a> / 
 <a href="javascript:;" style="text-decoration:none; color:#333; border-bottom:1px dashed #333;" data-toggle="modal" onclick="$('#selectCategoryModal').modal('show').width(270);" ><?php echo __('Select category', 'menu'); ?></a><br /><br />
 
-
 <?php 
 
     echo Form::label('menu_item_name', __('Item name', 'menu'));
-    echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3'));
+    echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'input-xlarge error-field' : 'input-xlarge'));
 
     if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).'<span style="color:red;">'.$errors['menu_item_name_empty'].'</span>';
 
     echo (
         Form::label('menu_item_link', __('Item link', 'menu')).
-        Form::input('menu_item_link', $menu_item_link, array('class' => 'span3'))
+        Form::input('menu_item_link', $menu_item_link, array('class' => 'input-xlarge'))
     );
 
     echo (
         Form::label('menu_item_category', __('Item category', 'menu')).
-        Form::input('menu_item_category', $menu_item_category, array('class' => 'span3'))
+        Form::input('menu_item_category', $menu_item_category, array('class' => 'input-xlarge'))
     );
 ?>
 
@@ -33,13 +32,13 @@
     echo (
         Html::br().
         Form::label('menu_item_target', __('Item target', 'menu')).
-        Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'span3'))
+        Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'input-xlarge'))
     ); 
 
     echo (
         Html::br().
         Form::label('menu_item_order', __('Item order', 'menu')).
-        Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'span3'))
+        Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'input-xlarge'))
     ); 
 
     echo (
diff --git a/plugins/box/menu/views/backend/edit.view.php b/plugins/box/menu/views/backend/edit.view.php
index 42f597d..b73bbb5 100644
--- a/plugins/box/menu/views/backend/edit.view.php
+++ b/plugins/box/menu/views/backend/edit.view.php
@@ -10,22 +10,21 @@
 <a href="javascript:;" style="text-decoration:none; color:#333; border-bottom:1px dashed #333;" data-toggle="modal" onclick="$('#selectPageModal').modal('show').width(270);" ><?php echo __('Select page', 'menu'); ?></a> / 
 <a href="javascript:;" style="text-decoration:none; color:#333; border-bottom:1px dashed #333;" data-toggle="modal" onclick="$('#selectCategoryModal').modal('show').width(270);" ><?php echo __('Select category', 'menu'); ?></a><br /><br />
 
-
 <?php 
 
     echo Form::label('menu_item_name', __('Item name', 'menu'));
-    echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3'));
+    echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'input-xlarge error-field' : 'input-xlarge'));
 
     if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).'<span style="color:red;">'.$errors['menu_item_name_empty'].'</span>';
 
     echo (
         Form::label('menu_item_link', __('Item link', 'menu')).
-        Form::input('menu_item_link', $menu_item_link, array('class' => 'span3'))
+        Form::input('menu_item_link', $menu_item_link, array('class' => 'input-xlarge'))
     );
 
     echo (
         Form::label('menu_item_category', __('Item category', 'menu')).
-        Form::input('menu_item_category', $menu_item_category, array('class' => 'span3'))
+        Form::input('menu_item_category', $menu_item_category, array('class' => 'input-xlarge'))
     );
 ?>
 
@@ -33,13 +32,13 @@
     echo (
         Html::br().
         Form::label('menu_item_target', __('Item target', 'menu')).
-        Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'span3'))
+        Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'input-xlarge'))
     ); 
 
     echo (
         Html::br().
         Form::label('menu_item_order', __('Item order', 'menu')).
-        Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'span3'))
+        Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'input-xlarge'))
     ); 
 
     echo (
diff --git a/plugins/box/menu/views/backend/index.view.php b/plugins/box/menu/views/backend/index.view.php
index 623b0ac..d7dca46 100644
--- a/plugins/box/menu/views/backend/index.view.php
+++ b/plugins/box/menu/views/backend/index.view.php
@@ -37,9 +37,9 @@
 <table class="table table-bordered">
     <thead>
         <tr>
-            <td><?php echo __('Name', 'menu'); ?></td>
-            <td class="span2"><?php echo __('Order', 'menu'); ?></td>
-            <td width="30%"><?php echo __('Actions', 'menu'); ?></td>
+            <th><?php echo __('Name', 'menu'); ?></th>
+            <th class="span2"><?php echo __('Order', 'menu'); ?></th>
+            <th></th>
         </tr>
     </thead>
     <tbody>
@@ -64,11 +64,13 @@
                 <?php echo $item['order']; ?>
             </td>
             <td>
-                <?php echo Html::anchor(__('Edit', 'menu'), 'index.php?id=menu&action=edit&item_id='.$item['id'], array('class' => 'btn btn-actions')); ?>
+                <div class="pull-right">
+                <?php echo Html::anchor(__('Edit', 'menu'), 'index.php?id=menu&action=edit&item_id='.$item['id'], array('class' => 'btn btn-small')); ?>
                 <?php echo Html::anchor(__('Delete', 'menu'),
                            'index.php?id=menu&delete_item='.$item['id'],
-                           array('class' => 'btn btn-actions', 'onclick' => "return confirmDelete('".__('Delete item :name', 'menu', array(':name' => $item['name']))."')"));
+                           array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete item :name', 'menu', array(':name' => $item['name']))."')"));
                  ?>
+             </div>
             </td>
         </tr>
         <?php } ?>
diff --git a/plugins/box/themes/views/backend/add.view.php b/plugins/box/themes/views/backend/add.view.php
index 0be72fc..0207062 100644
--- a/plugins/box/themes/views/backend/add.view.php
+++ b/plugins/box/themes/views/backend/add.view.php
@@ -15,7 +15,7 @@
 <?php echo (Form::label('name', __('Name', 'themes'))); ?>
 
 <div class="input-append">
-    <?php echo (Form::input('name', $name, array('class' => (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?>
+    <?php echo (Form::input('name', $name, array('class' => (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
     <?php if ($action == 'chunk') { ?><span class="add-on">.chunk.php</span><?php } ?>
     <?php if ($action == 'template') { ?><span class="add-on">.template.php</span><?php } ?>
     <?php if ($action == 'styles') { ?><span class="add-on">.css</span><?php } ?> 
diff --git a/plugins/box/themes/views/backend/edit.view.php b/plugins/box/themes/views/backend/edit.view.php
index 250e65d..28df5a9 100644
--- a/plugins/box/themes/views/backend/edit.view.php
+++ b/plugins/box/themes/views/backend/edit.view.php
@@ -12,7 +12,6 @@
         if (isset($errors['file_empty_name']) or isset($errors['file_exists'])) $error_class = 'error'; else $error_class = '';
 
         echo (Form::open(null, array('class' => 'form-horizontal')));
-
         echo (Form::hidden('csrf', Security::token()));
 
 ?>
@@ -26,7 +25,7 @@
 <?php echo (Form::label('name', __('Name', 'themes'))); ?>
 
 <div class="input-append">
-    <?php echo (Form::input('name', $name, array('class' => (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?>
+    <?php echo (Form::input('name', $name, array('class' => (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
     <?php if ($action == 'chunk') { ?><span class="add-on">.chunk.php</span><?php } ?>
     <?php if ($action == 'template') { ?><span class="add-on">.template.php</span><?php } ?>
     <?php if ($action == 'styles') { ?><span class="add-on">.css</span><?php } ?> 
@@ -50,8 +49,8 @@
     echo (
        Form::textarea('content', Html::toText($content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor')).
        Html::br(2).
-       Form::submit('edit_file_and_exit', __('Save and exit', 'themes'), array('class' => 'btn default')).Html::nbsp(2).
-       Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn default')). Html::nbsp().
+       Form::submit('edit_file_and_exit', __('Save and exit', 'themes'), array('class' => 'btn')).Html::nbsp(2).
+       Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn')). Html::nbsp().
        Form::close()
     );
         
diff --git a/plugins/box/themes/views/backend/index.view.php b/plugins/box/themes/views/backend/index.view.php
index 2cf8f44..087e3b3 100755
--- a/plugins/box/themes/views/backend/index.view.php
+++ b/plugins/box/themes/views/backend/index.view.php
@@ -11,7 +11,7 @@
                 Form::open().
                 Form::hidden('csrf', Security::token()).
                 Form::label('themes', __('Select theme', 'themes')).
-                Form::select('themes', $themes_site, $current_site_theme, array('class' => 'span6')). Html::br().
+                Form::select('themes', $themes_site, $current_site_theme, array('class' => 'input-xlarge')). Html::br().
                 Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn')).
                 Form::close()
             );
@@ -32,7 +32,7 @@
                 Form::open().
                 Form::hidden('csrf', Security::token()).
                 Form::label('themes', __('Select theme', 'themes')).
-                Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'span6')). Html::br().
+                Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'input-xlarge')). Html::br().
                 Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn')).
                 Form::close()
             );
@@ -61,23 +61,26 @@
 <!-- Templates_list -->
 <table class="table table-bordered">
     <thead>
-        <tr><td><?php echo __('Templates', 'themes'); ?></td><td width="40%"><?php echo __('Actions', 'themes'); ?></td></tr>
+        <tr>
+            <th><?php echo __('Templates', 'themes'); ?></th>
+            <th></th>
+        </tr>
     </thead>
     <tbody>
     <?php if (count($templates) != 0) foreach ($templates as $template) { ?>
     <tr>
         <td><?php echo basename($template, '.template.php'); ?></td>        
-        <td>        
-            <div class="btn-toolbar">
+        <td>      
+            <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_template&filename='.basename($template, '.template.php'), array('class' => 'btn btn-actions')); ?>
-                    <a class="btn dropdown-toggle btn-actions" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_template&filename='.basename($template, '.template.php'), 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">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_template&filename='.basename($template, '.template.php').'&token='.Security::token(), array('title' => __('Clone'))); ?></li>
                     </ul>            
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_template&filename='.basename($template, '.template.php').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')"));
+                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')"));
                     ?>
                 </div>
             </div>
@@ -93,23 +96,26 @@
 <!-- Chunks_list -->
 <table class="table table-bordered">
     <thead>
-        <tr><td><?php echo __('Chunks', 'themes'); ?></td><td width="40%"><?php echo __('Actions', 'themes'); ?></td></tr>
+        <tr>
+            <th><?php echo __('Chunks', 'themes'); ?></th>
+            <th></th>
+        </tr>
     </thead>
     <tbody>
     <?php if (count($chunks) != 0) foreach ($chunks as $chunk) { ?>
     <tr>
         <td><?php echo basename($chunk, '.chunk.php'); ?></td>        
         <td>    
-            <div class="btn-toolbar">
+            <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_chunk&filename='.basename($chunk, '.chunk.php'), array('class' => 'btn btn-actions')); ?>
-                    <a class="btn dropdown-toggle btn-actions" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_chunk&filename='.basename($chunk, '.chunk.php'), 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">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_chunk&filename='.basename($chunk, '.chunk.php').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>            
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_chunk&filename='.basename($chunk, '.chunk.php').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')"));
+                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')"));
                     ?>
                 </div>
             </div>
@@ -125,23 +131,26 @@
 <!-- Styles_list -->
 <table class="table table-bordered">
     <thead>
-        <tr><td><?php echo __('Styles', 'themes'); ?></td><td width="40%"><?php echo __('Actions', 'themes'); ?></td></tr>
+        <tr>
+            <th><?php echo __('Styles', 'themes'); ?></td>
+            <th></th>
+        </tr>
     </thead>
     <tbody>
     <?php if (count($styles) != 0) foreach ($styles as $style) { ?>
     <tr>
         <td><?php echo basename($style, '.css'); ?></td>        
         <td>            
-            <div class="btn-toolbar">
+            <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_styles&filename='.basename($style, '.css'), array('class' => 'btn btn-actions')); ?>
-                    <a class="btn dropdown-toggle btn-actions" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_styles&filename='.basename($style, '.css'), 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">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_styles&filename='.basename($style, '.css').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>            
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_styles&filename='.basename($style, '.css').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')"));
+                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')"));
                     ?>
                 </div>
             </div>
@@ -157,23 +166,26 @@
 <!-- Scripts_list -->
 <table class="table table-bordered">
     <thead>
-        <tr><td><?php echo __('Scripts', 'themes'); ?></td><td width="40%"><?php echo __('Actions', 'themes'); ?></td></tr>
+        <tr>
+            <th><?php echo __('Scripts', 'themes'); ?></th>
+            <th></th>
+        </tr>
     </thead>
     <tbody>
     <?php if (count($scripts) != 0) foreach ($scripts as $script) { ?>
     <tr>
         <td><?php echo basename($script, '.js'); ?></td>        
         <td>            
-            <div class="btn-toolbar">
+            <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_script&filename='.basename($script, '.js'), array('class' => 'btn btn-actions')); ?>
-                    <a class="btn dropdown-toggle btn-actions" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_script&filename='.basename($script, '.js'), 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">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_script&filename='.basename($script, '.js').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>            
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_script&filename='.basename($script, '.js').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')"));
+                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')"));
                     ?>
                 </div>
             </div>
diff --git a/plugins/box/users/views/backend/add.view.php b/plugins/box/users/views/backend/add.view.php
index 20955f2..0c9e5eb 100644
--- a/plugins/box/users/views/backend/add.view.php
+++ b/plugins/box/users/views/backend/add.view.php
@@ -7,7 +7,7 @@
         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'])) ? 'span3 error-field' : 'span3'))
+        Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'input-xlarge error-field' : 'input-xlarge'))
     );
 
     if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_this_user_alredy_exists'].'</span>';
@@ -15,14 +15,14 @@
 
     echo (
         Form::label('password', __('Password', 'users')).
-        Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'span3 error-field' : 'span3'))
+        Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'input-xlarge error-field' : 'input-xlarge'))
     );
 
     if (isset($errors['users_empty_password'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_password'].'</span>';
 
     echo (
         Form::label('email', __('Email', 'users')).
-        Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'span3 error-field' : 'span3'))
+        Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'input-xlarge error-field' : 'input-xlarge'))
     );
 
     if (isset($errors['users_this_email_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_email_alredy_exists'].'</span>';
@@ -30,7 +30,7 @@
 
     echo(
         Form::label('role', __('Role', 'users')).
-        Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), null, array('class' => 'span3')). Html::br(2).
+        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()
     );
diff --git a/plugins/box/users/views/backend/edit.view.php b/plugins/box/users/views/backend/edit.view.php
index 1557d92..270e938 100644
--- a/plugins/box/users/views/backend/edit.view.php
+++ b/plugins/box/users/views/backend/edit.view.php
@@ -26,7 +26,7 @@
 
         if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {        
             echo Form::label('login', __('Username', 'users'));
-            echo Form::input('login', $user['login'], array('class' => 'span6'));
+            echo Form::input('login', $user['login'], array('class' => 'input-xlarge'));
         } else {
             echo Form::hidden('login', $user['login']);
         }
@@ -34,22 +34,22 @@
         echo (
             Html::br().
             Form::label('firstname', __('Firstname', 'users')).    
-            Form::input('firstname', $user_firstname, array('class' => 'span6')).Html::br().
+            Form::input('firstname', $user_firstname, array('class' => 'input-xlarge')).Html::br().
             Form::label('lastname', __('Lastname', 'users')).
-            Form::input('lastname', $user_lastname, array('class' => 'span6')).Html::br().
+            Form::input('lastname', $user_lastname, array('class' => 'input-xlarge')).Html::br().
             Form::label('email', __('Email', 'users')).
-            Form::input('email', $user_email, array('class' => 'span6')).Html::br().
+            Form::input('email', $user_email, array('class' => 'input-xlarge')).Html::br().
             Form::label('twitter', __('Twitter', 'users')).
-            Form::input('twitter', $user_twitter, array('class' => 'span6')).Html::br().
+            Form::input('twitter', $user_twitter, array('class' => 'input-xlarge')).Html::br().
             Form::label('skype', __('Skype', 'users')).
-            Form::input('skype', $user_skype, array('class' => 'span6')).Html::br().
+            Form::input('skype', $user_skype, array('class' => 'input-xlarge')).Html::br().
             Form::label('about_me', __('About Me', 'users')).
-            Form::textarea('about_me', $user_about_me, array('class' => 'span6')).Html::br()
+            Form::textarea('about_me', $user_about_me, array('class' => 'input-xlarge')).Html::br()
         );
 
         if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {        
             echo Form::label('role', __('Role', 'users'));
-            echo Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), $user['role'], array('class' => 'span3')). Html::br();
+            echo Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), $user['role'], array('class' => 'input-xlarge')). Html::br();
         } else {        
             echo Form::hidden('role', $_SESSION['user_role']);
         }
@@ -72,7 +72,7 @@
             Form::hidden('csrf', Security::token()).
             Form::hidden('user_id', Request::get('user_id')).
             Form::label('new_password', __('New password', 'users')).
-            Form::password('new_password', null, array('class' => 'span6')).Html::br().Html::br().
+            Form::password('new_password', null, array('class' => 'input-xlarge')).Html::br().Html::br().
             Form::submit('edit_profile_password', __('Save', 'users'), array('class' => 'btn')).
             Form::close()
         );    
diff --git a/plugins/box/users/views/backend/index.view.php b/plugins/box/users/views/backend/index.view.php
index d3551c1..964cf1d 100755
--- a/plugins/box/users/views/backend/index.view.php
+++ b/plugins/box/users/views/backend/index.view.php
@@ -19,11 +19,11 @@
 <table class="table table-bordered">
     <thead>
         <tr>
-            <td><?php echo __('Username', 'users'); ?></td>
-            <td><?php echo __('Email', 'users'); ?></td>
-            <td><?php echo __('Registered', 'users'); ?></td>
-            <td><?php echo __('Role', 'users'); ?></td>
-            <td width="30%"><?php echo __('Actions', 'users'); ?></td>
+            <th><?php echo __('Username', 'users'); ?></th>
+            <th><?php echo __('Email', 'users'); ?></th>
+            <th><?php echo __('Registered', 'users'); ?></th>
+            <th><?php echo __('Role', 'users'); ?></th>
+            <th></th>
         </tr>
     </thead>
     <tbody>
@@ -42,11 +42,13 @@
             <?php echo $roles["{$user['role']}"]; ?>
         </td>
         <td>
-            <?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-actions')); ?>
+            <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(__('Delete', 'users'),
                        'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
-                       array('class' => 'btn btn-actions', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
+                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
              ?>
+             </div>
         </td>
     </tr> 
     <?php } ?>