diff --git a/plugins/box/pages/views/backend/add.view.php b/plugins/box/pages/views/backend/add.view.php
index 196ca5d..1c5ad84 100644
--- a/plugins/box/pages/views/backend/add.view.php
+++ b/plugins/box/pages/views/backend/add.view.php
@@ -1,121 +1,116 @@
-<div class="row-fluid">
-    <div class="span12">
+<h2><?php echo __('New Page', 'pages'); ?></h2>
+<br />
 
-        <h2><?php echo __('New page', 'pages'); ?></h2>
-        <br />
+<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-        <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
+<?php    
+    echo (
+        Form::open().
+        Form::hidden('csrf', Security::token())
+    );
+?>
 
-        <?php    
+<ul class="nav nav-tabs">
+    <li <?php if (Notification::get('page')) { ?>class="active"<?php } ?>><a href="#page" data-toggle="tab"><?php echo __('Page', 'pages'); ?></a></li>
+    <li <?php if (Notification::get('metadata')) { ?>class="active"<?php } ?>><a href="#metadata" data-toggle="tab"><?php echo __('Metadata', 'pages'); ?></a></li>
+    <li <?php if (Notification::get('settings')) { ?>class="active"<?php } ?>><a href="#settings" data-toggle="tab"><?php echo __('Settings', 'pages'); ?></a></li>
+</ul>
+ 
+<div class="tab-content tab-page">
+    <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
+        <?php
             echo (
-                Form::open().
-                Form::hidden('csrf', Security::token())
+                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'))
+            );
+            if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
+
+            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'))
+            );
+
+            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 class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
+        <?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'))                        
             );
         ?>
 
-        <ul class="nav nav-tabs">
-            <li <?php if (Notification::get('page')) { ?>class="active"<?php } ?>><a href="#page" data-toggle="tab"><?php echo __('Page', 'pages'); ?></a></li>
-            <li <?php if (Notification::get('metadata')) { ?>class="active"<?php } ?>><a href="#metadata" data-toggle="tab"><?php echo __('Metadata', 'pages'); ?></a></li>
-            <li <?php if (Notification::get('settings')) { ?>class="active"<?php } ?>><a href="#settings" data-toggle="tab"><?php echo __('Settings', 'pages'); ?></a></li>
-        </ul>
-         
-        <div class="tab-content tab-page">
-            <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
-                <?php
-                    echo (
-                        Form::label('page_title', __('Title', 'pages')).
-                        Form::input('page_title', $post_title, array('class' => (isset($errors['pages_empty_title'])) ? 'span6 error-field' : 'span6'))
-                    );
-                    if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
-
-                    echo (  
-                        Html::br(2).
-                        Form::label('page_name', __('Name (slug)', 'pages')).    
-                        Form::input('page_name', $post_name, array('class' => (isset($errors['pages_empty_name'])) ? 'span6 error-field' : 'span6'))
-                    );
-
-                    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 class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
-                <?php
-                    echo (
-                        Form::label('page_keywords', __('Keywords', 'pages')).
-                        Form::input('page_keywords', $post_keywords, array('class' => 'span8')).
-                        Html::br(2).
-                        Form::label('page_description', __('Description', 'pages')).
-                        Form::textarea('page_description', $post_description, array('class' => 'span8'))                        
-                    );
-                ?>
-
-                <?php 
-                    echo (   
-                        Html::br(2).  
-                        Form::label('robots', __('Search Engines Robots', 'pages')).   
-                        '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 class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
-                <div class="row-fluid">
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('pages', __('Parent', 'pages')).
-                            Form::select('pages', $pages_array, $parent_page) 
-                        );
-                    ?>
-                    </div>    
-                    <div class="span3">
-                    <?php
-                        echo (
-                            Form::label('templates', __('Template', 'pages')).
-                            Form::select('templates', $templates_array, $post_template)
-                        ); 
-                    ?>
-                    </div>
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('status', __('Status', 'pages')).
-                            Form::select('status', $status_array, $post_status) 
-                        );
-                    ?>
-                    </div>
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('access', __('Access', 'pages')).
-                            Form::select('access', $access_array, $post_access) 
-                        );
-                    ?>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        <br /><br />
-        
-        <?php Action::run('admin_editor', array(Html::toText($post_content))); ?>
-
-        <br />
-
+        <?php 
+            echo (   
+                Html::br(2).  
+                Form::label('robots', __('Search Engines Robots', 'pages')).   
+                '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 class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
         <div class="row-fluid">
-            <div class="span6">
-                <?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'))
-                    );
-                ?>
+            <div class="span3">
+            <?php 
+                echo (
+                    Form::label('pages', __('Parent', 'pages')).
+                    Form::select('pages', $pages_array, $parent_page) 
+                );
+            ?>
+            </div>    
+            <div class="span3">
+            <?php
+                echo (
+                    Form::label('templates', __('Template', 'pages')).
+                    Form::select('templates', $templates_array, $post_template)
+                ); 
+            ?>
             </div>
-            <div class="span6">
-                <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 class="span3">
+            <?php 
+                echo (
+                    Form::label('status', __('Status', 'pages')).
+                    Form::select('status', $status_array, $post_status) 
+                );
+            ?>
+            </div>
+            <div class="span3">
+            <?php 
+                echo (
+                    Form::label('access', __('Access', 'pages')).
+                    Form::select('access', $access_array, $post_access) 
+                );
+            ?>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<br /><br />
+
+<?php Action::run('admin_editor', array(Html::toText($post_content))); ?>
+
+<br />
+
+<div class="row-fluid">
+    <div class="span6">
+        <?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'))
+            );
+        ?>
+    </div>
+    <div class="span6">
+        <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>
+</div>
diff --git a/plugins/box/pages/views/backend/edit.view.php b/plugins/box/pages/views/backend/edit.view.php
index 6e7976f..83ae4f1 100644
--- a/plugins/box/pages/views/backend/edit.view.php
+++ b/plugins/box/pages/views/backend/edit.view.php
@@ -1,155 +1,150 @@
-<div class="row-fluid">
-    <div class="span12">
+<h2><?php if (Request::get('name') == 'error404') { echo __('Edit 404 Page', 'pages'); } else { echo __('Edit Page', 'pages'); } ?></h2>
+<br />
 
-        <h2><?php if (Request::get('name') == 'error404') { echo __('Edit 404 page', 'pages'); } else { echo __('Edit page', 'pages'); } ?></h2>
-        <br />
+<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-        <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
+<?php    
+    echo (
+        Form::open().
+        Form::hidden('csrf', Security::token()).
+        Form::hidden('page_old_name', Request::get('name')).
+        Form::hidden('old_parent', $page['parent']).
+        Form::hidden('page_id', $page['id'])
+    );
+?>
 
-        <?php    
+<ul class="nav nav-tabs">
+    <li <?php if (Notification::get('page')) { ?>class="active"<?php } ?>><a href="#page" data-toggle="tab"><?php echo __('Page', 'pages'); ?></a></li>
+    <li <?php if (Notification::get('metadata')) { ?>class="active"<?php } ?>><a href="#metadata" data-toggle="tab"><?php echo __('Metadata', 'pages'); ?></a></li>
+    <li <?php if (Notification::get('settings')) { ?>class="active"<?php } ?>><a href="#settings" data-toggle="tab"><?php echo __('Settings', 'pages'); ?></a></li>
+</ul>
+ 
+<div class="tab-content tab-page">
+    <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
+        <?php
             echo (
-                Form::open().
-                Form::hidden('csrf', Security::token()).
-                Form::hidden('page_old_name', Request::get('name')).
-                Form::hidden('old_parent', $page['parent']).
-                Form::hidden('page_id', $page['id'])
+                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'))
+            );
+            if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
+
+            if (Request::get('name') !== 'error404') {
+                echo (
+                    Html::br(2).   
+                    Form::label('page_name', __('Name (slug)', 'pages'))
+                );
+            }
+
+            if (Request::get('name') == 'error404') {
+                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'))
+                );
+            }
+
+            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 class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
+
+
+        <?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'))                        
+            );
+
+            echo (  
+                Html::br(2).     
+                Form::label('robots', __('Search Engines Robots', 'pages')).   
+                '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)
             );
         ?>
-
-        <ul class="nav nav-tabs">
-            <li <?php if (Notification::get('page')) { ?>class="active"<?php } ?>><a href="#page" data-toggle="tab"><?php echo __('Page', 'pages'); ?></a></li>
-            <li <?php if (Notification::get('metadata')) { ?>class="active"<?php } ?>><a href="#metadata" data-toggle="tab"><?php echo __('Metadata', 'pages'); ?></a></li>
-            <li <?php if (Notification::get('settings')) { ?>class="active"<?php } ?>><a href="#settings" data-toggle="tab"><?php echo __('Settings', 'pages'); ?></a></li>
-        </ul>
-         
-        <div class="tab-content tab-page">
-            <div class="tab-pane <?php if (Notification::get('page')) { ?>active<?php } ?>" id="page">
-                <?php
-                    echo (
-                        Form::label('page_title', __('Title', 'pages')).
-                        Form::input('page_title', $title_to_edit, array('class' => (isset($errors['pages_empty_title'])) ? 'span6 error-field' : 'span6'))
-                    );
-                    if (isset($errors['pages_empty_title'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['pages_empty_title'].'</span>';
-
-                    if (Request::get('name') !== 'error404') {
-                        echo (
-                            Html::br(2).   
-                            Form::label('page_name', __('Name (slug)', 'pages'))
-                        );
-                    }
-
-                    if (Request::get('name') == 'error404') {
-                        echo Form::hidden('page_name', $slug_to_edit);
-                    } else {
-                        echo (
-                            Form::input('page_name', $slug_to_edit, array('class' => (isset($errors['pages_empty_name'])) ? 'span6 error-field' : 'span6'))
-                        );
-                    }
-
-                    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 class="tab-pane <?php if (Notification::get('metadata')) { ?>active<?php } ?>" id="metadata">
-
-
-                <?php
-                    echo (
-                        Form::label('page_keywords', __('Keywords', 'pages')).
-                        Form::input('page_keywords', $keywords_to_edit, array('class' => 'span8')).
-                        Html::br(2).
-                        Form::label('page_description', __('Description', 'pages')).
-                        Form::textarea('page_description', $description_to_edit, array('class' => 'span8'))                        
-                    );
-
-                    echo (  
-                        Html::br(2).     
-                        Form::label('robots', __('Search Engines Robots', 'pages')).   
-                        '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 class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
-                <div class="row-fluid">
-                    <?php
-                        if (Request::get('name') == 'error404') {
-                            echo Form::hidden('pages', $parent_page);
-                        } else {
-                    ?>
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('pages', __('Parent', 'pages')).
-                            Form::select('pages', $pages_array, $parent_page)
-                        );
-                    ?>
-                    </div>
-                    <?php } ?>
-                    <?php if (Request::get('name') != 'error404') { ?>
-                        <div class="span3">
-                    <?php } else { ?>
-                    <div>
-                    <?php } ?>
-                    <?php
-                        echo (
-                            Form::label('templates', __('Template', 'pages')).
-                            Form::select('templates', $templates_array, $template)
-                        ); 
-                    ?>
-                    </div>
-                    <?php 
-                        if (Request::get('name') == 'error404') {
-                            echo Form::hidden('status', $status);
-                        } else {
-                    ?>
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('status', __('Status', 'pages')).
-                            Form::select('status', $status_array, $status)
-                        );
-                    ?>
-                    </div>
-                    <?php } ?>
-                    <?php 
-                        if (Request::get('name') == 'error404') {
-                            echo Form::hidden('access', $access);
-                        } else {
-                    ?>
-                    <div class="span3">
-                    <?php 
-                        echo (
-                            Form::label('access', __('Access', 'pages')).
-                            Form::select('access', $access_array, $access)
-                        );
-                    ?>
-                    </div>
-                    <?php } ?>
-                </div>
-            </div>
-        </div>
-
-
-        <br /><br />
-
-        <?php Action::run('admin_editor', array(Html::toText($to_edit))); ?>
-
-        <br />
-
+    </div>
+    <div class="tab-pane <?php if (Notification::get('settings')) { ?>active<?php } ?>" id="settings">
         <div class="row-fluid">
-            <div class="span6">
-                <?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'))
-                    );
-                ?>
+            <?php
+                if (Request::get('name') == 'error404') {
+                    echo Form::hidden('pages', $parent_page);
+                } else {
+            ?>
+            <div class="span3">
+            <?php 
+                echo (
+                    Form::label('pages', __('Parent', 'pages')).
+                    Form::select('pages', $pages_array, $parent_page)
+                );
+            ?>
             </div>
-            <div class="span6">
-                <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(); ?>
+            <?php } ?>
+            <?php if (Request::get('name') != 'error404') { ?>
+                <div class="span3">
+            <?php } else { ?>
+            <div>
+            <?php } ?>
+            <?php
+                echo (
+                    Form::label('templates', __('Template', 'pages')).
+                    Form::select('templates', $templates_array, $template)
+                ); 
+            ?>
             </div>
+            <?php 
+                if (Request::get('name') == 'error404') {
+                    echo Form::hidden('status', $status);
+                } else {
+            ?>
+            <div class="span3">
+            <?php 
+                echo (
+                    Form::label('status', __('Status', 'pages')).
+                    Form::select('status', $status_array, $status)
+                );
+            ?>
+            </div>
+            <?php } ?>
+            <?php 
+                if (Request::get('name') == 'error404') {
+                    echo Form::hidden('access', $access);
+                } else {
+            ?>
+            <div class="span3">
+            <?php 
+                echo (
+                    Form::label('access', __('Access', 'pages')).
+                    Form::select('access', $access_array, $access)
+                );
+            ?>
+            </div>
+            <?php } ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+
+<br /><br />
+
+<?php Action::run('admin_editor', array(Html::toText($to_edit))); ?>
+
+<br />
+
+<div class="row-fluid">
+    <div class="span6">
+        <?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'))
+            );
+        ?>
+    </div>
+    <div class="span6">
+        <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>
+</div>
diff --git a/plugins/box/pages/views/backend/index.view.php b/plugins/box/pages/views/backend/index.view.php
index 756b912..48df27e 100755
--- a/plugins/box/pages/views/backend/index.view.php
+++ b/plugins/box/pages/views/backend/index.view.php
@@ -1,106 +1,100 @@
-<div class="row-fluid">
-    <div class="span12">
+<h2><?php echo __('Pages', 'pages'); ?></h2>
+<br />
 
-        <h2><?php echo __('Pages', 'pages'); ?></h2>
-        <br />
+<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
-        <?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')) 
+        ); 
+?>
 
-        <?php
-            echo ( 
-                    Html::anchor(__('Create new page', 'pages'), 'index.php?id=pages&action=add_page', array('title' => __('Create new page', 'pages'), 'class' => 'btn default 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 default btn-small')) 
-                ); 
-        ?>
+<br /><br />
 
-        <br /><br />
-
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <td width="3%"></td>
-                    <td><?php echo __('Name', 'pages'); ?></td>
-                    <td><?php echo __('Author', 'pages'); ?></td>
-                    <td><?php echo __('Status', 'pages'); ?></td>
-                    <td><?php echo __('Access', 'pages'); ?></td>
-                    <td><?php echo __('Date', 'pages'); ?></td>
-                    <td width="40%"><?php echo __('Actions', 'pages'); ?></td>
-                </tr>
-            </thead>
-            <tbody>
-            <?php
-                if (count($pages) != 0) { 
-                        foreach ($pages as $page) {
-                            if ($page['parent'] != '') { $dash = Html::arrow('right').'&nbsp;&nbsp;'; } else { $dash = ""; }
-             ?>
-             <?php if ($page['slug'] != 'error404') { ?>
-             <?php
-                $expand = PagesAdmin::$pages->select('[slug="'.(string)$page['parent'].'"]', null);
-                if ($page['parent'] !== '' && isset($expand['expand']) && $expand['expand'] == '1') { $visibility = 'style="display:none;"'; } else { $visibility = ''; }
-             ?>
-             <tr <?php echo $visibility; ?> <?php if(trim($page['parent']) !== '') {?> rel="children_<?php echo $page['parent']; ?>" <?php } ?>>  
-                <td> 
-                <?php                    
-                    if (count(PagesAdmin::$pages->select('[parent="'.(string)$page['slug'].'"]', 'all')) > 0) {
-                        if (isset($page['expand']) && $page['expand'] == '1') {
-                            echo '<a href="javascript:;" class="btn-expand parent" token="'.Security::token().'" rel="'.$page['slug'].'">+</a>';
-                        } else {
-                            echo '<a href="javascript:;" class="btn-expand parent" token="'.Security::token().'" rel="'.$page['slug'].'">-</a>';
-                        }
-                    }
-                ?>    
-                </td> 
-                <td>
-                    <?php
-                        $_parent = (trim($page['parent']) == '') ? '' : $page['parent'];
-                        $parent  = (trim($page['parent']) == '') ? '' : $page['parent'].'/';
-                        echo (trim($page['parent']) == '') ? '' : '&nbsp;';
-                        echo $dash.Html::anchor(Html::toText($page['title']), $site_url.$parent.$page['slug'], array('target' => '_blank', 'rel' => 'children_'.$_parent)); 
-                    ?>
-                </td>
-                <td>
-                    <?php echo $page['author']; ?>
-                </td>
-                <td>
-                    <?php echo $page['status']; ?>
-                </td>
-                <td>
-                    <?php echo $page['access']; ?>
-                </td>
-                <td>
-                    <?php echo Date::format($page['date'], "j.n.Y"); ?>
-                </td>
-                <td>
-                    <div class="btn-toolbar">
-                        <div class="btn-group">
-                            <?php echo Html::anchor(__('Edit', 'pages'), 'index.php?id=pages&action=edit_page&name='.$page['slug'], 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>
-                            <ul class="dropdown-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>
-                            </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-actions-default', 'onclick' => "return confirmDelete('".__("Delete page: :page", 'pages', array(':page' => Html::toText($page['title'])))."')"));
-                            ?>
-                        </div>
-                    </div>  
-                </td>
-             </tr> 
-   
-             <?php } ?>
-            <?php
-                    } 
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <td width="3%"></td>
+            <td><?php echo __('Name', 'pages'); ?></td>
+            <td class="hidden-phone"><?php echo __('Author', 'pages'); ?></td>
+            <td class="hidden-phone"><?php echo __('Status', 'pages'); ?></td>
+            <td class="hidden-phone"><?php echo __('Access', 'pages'); ?></td>
+            <td class="hidden-phone"><?php echo __('Date', 'pages'); ?></td>
+            <td></td>
+        </tr>
+    </thead>
+    <tbody>
+    <?php
+        if (count($pages) != 0) { 
+                foreach ($pages as $page) {
+                    if ($page['parent'] != '') { $dash = Html::arrow('right').'&nbsp;&nbsp;'; } else { $dash = ""; }
+     ?>
+     <?php if ($page['slug'] != 'error404') { ?>
+     <?php
+        $expand = PagesAdmin::$pages->select('[slug="'.(string)$page['parent'].'"]', null);
+        if ($page['parent'] !== '' && isset($expand['expand']) && $expand['expand'] == '1') { $visibility = 'style="display:none;"'; } else { $visibility = ''; }
+     ?>
+     <tr <?php echo $visibility; ?> <?php if(trim($page['parent']) !== '') {?> rel="children_<?php echo $page['parent']; ?>" <?php } ?>>  
+        <td> 
+        <?php                    
+            if (count(PagesAdmin::$pages->select('[parent="'.(string)$page['slug'].'"]', 'all')) > 0) {
+                if (isset($page['expand']) && $page['expand'] == '1') {
+                    echo '<a href="javascript:;" class="btn-expand parent" token="'.Security::token().'" rel="'.$page['slug'].'">+</a>';
+                } else {
+                    echo '<a href="javascript:;" class="btn-expand parent" token="'.Security::token().'" rel="'.$page['slug'].'">-</a>';
                 }
+            }
+        ?>    
+        </td> 
+        <td>
+            <?php
+                $_parent = (trim($page['parent']) == '') ? '' : $page['parent'];
+                $parent  = (trim($page['parent']) == '') ? '' : $page['parent'].'/';
+                echo (trim($page['parent']) == '') ? '' : '&nbsp;';
+                echo $dash.Html::anchor(Html::toText($page['title']), $site_url.$parent.$page['slug'], array('target' => '_blank', 'rel' => 'children_'.$_parent)); 
             ?>
-            </tbody>
-        </table>
+        </td>
+        <td class="hidden-phone">
+            <?php echo $page['author']; ?>
+        </td>
+        <td class="hidden-phone">
+            <?php echo $page['status']; ?>
+        </td>
+        <td class="hidden-phone">
+            <?php echo $page['access']; ?>
+        </td>
+        <td class="hidden-phone">
+            <?php echo Date::format($page['date'], "j.n.Y"); ?>
+        </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 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>
+                </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'])))."')"));
+                ?>
+            </div>  
+            </div>           
+        </td>
+     </tr> 
 
-        <form>
-            <input type="hidden" name="url" value="<?php echo Option::get('siteurl'); ?>admin/index.php?id=pages">
-        </form>
+     <?php } ?>
+    <?php
+            } 
+        }
+    ?>
+    </tbody>
+</table>
 
-    </div>
-</div>
\ No newline at end of file
+<form>
+    <input type="hidden" name="url" value="<?php echo Option::get('siteurl'); ?>admin/index.php?id=pages">
+</form>