diff --git a/views/layouts/_menu.php b/views/layouts/_menu.php
index eba897b..ba72622 100644
--- a/views/layouts/_menu.php
+++ b/views/layouts/_menu.php
@@ -5,7 +5,7 @@
 $this->widget('TbNavbar', array(
                                //'fluid' => true,
                                'collapse' => true,
-                               'items' => array(
+                               'items'    => array(
                                    array(
                                        'class' => 'TbMenu',
                                        /* 'items' => array(
@@ -19,17 +19,19 @@
                                    ),
                                    //'<form class="navbar-search pull-left" action=""><input type="text" class="search-query span2" placeholder="Search"></form>',
                                    array(
-                                       'class' => 'TbMenu',
+                                       'class'       => 'TbMenu',
                                        'htmlOptions' => array('class' => 'pull-right'),
-                                       'items' => array(
+                                       'items'       => array(
                                            array(
-                                               'label' => Yii::app()->language, 'url' => '#',
+                                               'label' => Yii::app()->language,
+                                               'icon'  => 'globe white',
+                                               'url'   => '#',
                                                'items' => array(
                                                    array('label' => 'Choose Language'),
                                                    array('label' => 'English',
-                                                         'url' => array_merge(array(''), $_GET, array('lang' => 'en'))),
+                                                         'url'   => array_merge(array(''), $_GET, array('lang' => 'en'))),
                                                    array('label' => 'Deutsch',
-                                                         'url' => array_merge(array(''), $_GET, array('lang' => 'de'))),
+                                                         'url'   => array_merge(array(''), $_GET, array('lang' => 'de'))),
                                                    //array('label' => 'Français', 'url' => array_merge(array(''), $_GET, array('lang' => 'fr'))),
                                                    //array('label' => 'Русский', 'url' => array_merge(array(''), $_GET, array('lang' => 'ru'))),
                                                ),
@@ -37,61 +39,71 @@
                                        )
                                    ),
                                    array(
-                                       'class' => 'TbMenu',
+                                       'class'       => 'TbMenu',
                                        'htmlOptions' => array('class' => 'pull-right'),
-                                       'items' => array(
-                                           array('label' => 'Administration', 'url' => '#',
-                                                 'visible' => !Yii::app()->user->isGuest, 'icon' => 'cog white',
-                                                 'items' => array(
-                                                     array('label' => 'Upload Media',
-                                                           'url' => array('/p3media/import/upload'),
+                                       'items'       => array(
+                                           array('url'     => '#',
+                                                 'visible' => Yii::app()->user->checkAccess('Editor'),
+                                                 'icon'    => 'pencil white',
+                                                 'items'   => array(
+                                                     array('label' => 'Manage Content'),
+                                                     array('label'   => 'Upload Media',
+                                                           'url'     => array('/p3media/import/upload'),
                                                            'visible' => Yii::app()->user->checkAccess('P3media.Import.*')),
-                                                     array('label' => 'Edit Page Translation', 'url' => array(
+                                                     array('label'   => 'Edit Page Translation', 'url' => array(
                                                          '/p3pages/p3PageTranslation/update',
-                                                         'id' => (P3Page::getActivePage()->getTranslationModel()) ?
+                                                         'id'        => (P3Page::getActivePage()
+                                                             ->getTranslationModel()) ?
                                                              P3Page::getActivePage()->getTranslationModel()->id : null,
                                                          'returnUrl' => $this->createUrl(null)),
                                                            'visible' => Yii::app()->user->checkAccess('P3pages.P3PageTranslation.*') && P3Page::getActivePage()
                                                                ->getTranslationModel()),
-                                                     array('label' => 'Create Page Translation', 'url' => array(
+                                                     array('label'   => 'Create Page Translation', 'url' => array(
                                                          '/p3pages/p3PageTranslation/create',
-                                                         'returnUrl' => $this->createUrl(null),
+                                                         'returnUrl'         => $this->createUrl(null),
                                                          'P3PageTranslation' => array('p3_page_id' => P3Page::getActivePage()->id,
-                                                                                      'language' => Yii::app()->language)),
+                                                                                      'language'   => Yii::app()->language)),
                                                            'visible' => Yii::app()->user->checkAccess('P3pages.P3PageTranslation.*') && !P3Page::getActivePage()
                                                                ->getTranslationModel() && !P3Page::getActivePage()->isNewRecord),
                                                      '---',
-                                                     array('label' => 'Media', 'url' => array('/p3media'),
+                                                     array('label'   => 'Media', 'url' => array('/p3media'),
                                                            'visible' => Yii::app()->user->checkAccess('P3media.Default.*')),
-                                                     array('label' => 'Pages', 'url' => array('/p3pages'),
+                                                     array('label'   => 'Pages', 'url' => array('/p3pages'),
                                                            'visible' => Yii::app()->user->checkAccess('P3pages.Default.*')),
-                                                     array('label' => 'Widgets', 'url' => array('/p3widgets'),
+                                                     array('label'   => 'Widgets', 'url' => array('/p3widgets'),
                                                            'visible' => Yii::app()->user->checkAccess('P3widgets.Default.*')),
-                                                     array('label' => 'Users', 'url' => array('/user/admin/admin'),
+                                                 )
+                                           ),
+                                           array('url'     => '#',
+                                                 'visible' => Yii::app()->user->checkAccess('Admin'),
+                                                 'icon'    => 'cog white',
+                                                 'items'   => array(
+                                                     array('label' => 'Manage Application'),
+                                                     array('label'   => 'Users', 'url' => array('/user/admin/admin'),
                                                            'visible' => Yii::app()->user->checkAccess('Admin')),
-                                                     array('label' => 'Rights', 'url' => array('/rights'),
+                                                     array('label'   => 'Rights', 'url' => array('/rights'),
                                                            'visible' => Yii::app()->user->checkAccess('Admin')),
                                                      '---',
-                                                     array('label' => 'Application', 'url' => array('/p3admin'),
+                                                     array('label'   => 'Application', 'url' => array('/p3admin'),
                                                            'visible' => Yii::app()->user->checkAccess('Admin')),
+                                                 )
+                                           ),
+                                           array('label'   => ucfirst(Yii::app()->user->name),
+                                                 'visible' => !Yii::app()->user->isGuest,
+                                                 'icon'    => Yii::app()->user->isSuperuser ?
+                                                     'warning-sign white' :
+                                                     'user white',
+                                                 'items'   => array(
+                                                     array('label' => 'User Settings'),
+                                                     array('label'   => 'Profile', 'url' => array('/user/profile'),
+                                                           'visible' => !Yii::app()->user->isGuest),
+                                                     array('label'   => 'User List', 'url' => array('/user'),
+                                                           'visible' => !Yii::app()->user->isGuest),
                                                      '---',
-                                                     array('label' => 'Visit Phundament Website',
-                                                           'url' => 'http://phundament.com'),
+                                                     array('label'   => 'Logout', 'url' => array('/site/logout'),
+                                                           'visible' => !Yii::app()->user->isGuest),
                                                  )),
-                                           array('label' => ucfirst(Yii::app()->user->name),
-                                                 'visible' => !Yii::app()->user->isGuest,
-                                                 'icon' => Yii::app()->user->isSuperuser ? 'warning-sign white' :
-                                                     'user white', 'items' => array(
-                                               array('label' => 'User Settings'),
-                                               array('label' => 'Profile', 'url' => array('/user/profile'),
-                                                     'visible' => !Yii::app()->user->isGuest),
-                                               array('label' => 'User List', 'url' => array('/user'),
-                                                     'visible' => !Yii::app()->user->isGuest),
-                                               '---',
-                                               array('label' => 'Logout', 'url' => array('/site/logout'),
-                                                     'visible' => !Yii::app()->user->isGuest),
-                                           )),
-                                           array('label' => 'Login', 'url' => Yii::app()->user->loginUrl,
+                                           array('label'   => 'Login', 'url' => Yii::app()->user->loginUrl,
                                                  'visible' => Yii::app()->user->isGuest, 'icon' => 'lock white'),
                                        ),
                                    ),
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 21f4f50..53e69e0 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -34,7 +34,7 @@
     </div>
     <hr>
     <footer>
-        <?php $this->widget('p3widgets.components.P3WidgetContainer', array('id' => 'footer')) ?>
+        Powered by <a href="http://phundament.com">Phundament</a>
     </footer>
 </div>
 <!-- /container -->