diff --git a/src/app/pages/charts/charts.module.js b/src/app/pages/charts/charts.module.js
index f81eb59..9eb8400 100644
--- a/src/app/pages/charts/charts.module.js
+++ b/src/app/pages/charts/charts.module.js
@@ -23,7 +23,7 @@
           title: 'Charts',
           sidebarMeta: {
             icon: 'ion-stats-bars',
-            order: 100,
+            order: 400,
           },
         });
   }
diff --git a/src/app/pages/components/components.module.js b/src/app/pages/components/components.module.js
new file mode 100644
index 0000000..b4fb6aa
--- /dev/null
+++ b/src/app/pages/components/components.module.js
@@ -0,0 +1,30 @@
+/**
+ * @author k.danovsky
+ * created on 15.01.2016
+ */
+(function () {
+  'use strict';
+
+  angular.module('BlurAdmin.pages.components', [
+    'BlurAdmin.pages.components.mail',
+    'BlurAdmin.pages.components.timeline',
+    'BlurAdmin.pages.components.tree',
+  ])
+      .config(routeConfig);
+
+  /** @ngInject */
+  function routeConfig($stateProvider) {
+    $stateProvider
+        .state('components', {
+          url: '/components',
+          template : '<ui-view></ui-view>',
+          abstract: true,
+          title: 'Components',
+          sidebarMeta: {
+            icon: 'ion-gear-a',
+            order: 150,
+          },
+        });
+  }
+
+})();
diff --git a/src/app/pages/mail/MailTabCtrl.js b/src/app/pages/components/mail/MailTabCtrl.js
similarity index 89%
rename from src/app/pages/mail/MailTabCtrl.js
rename to src/app/pages/components/mail/MailTabCtrl.js
index e46b6ae..0af5d3c 100644
--- a/src/app/pages/mail/MailTabCtrl.js
+++ b/src/app/pages/components/mail/MailTabCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
       .controller('MailTabCtrl', MailTabCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/mail/composeBox/compose.html b/src/app/pages/components/mail/composeBox/compose.html
similarity index 100%
rename from src/app/pages/mail/composeBox/compose.html
rename to src/app/pages/components/mail/composeBox/compose.html
diff --git a/src/app/pages/mail/composeBox/composeBoxCtrl.js b/src/app/pages/components/mail/composeBox/composeBoxCtrl.js
similarity index 83%
rename from src/app/pages/mail/composeBox/composeBoxCtrl.js
rename to src/app/pages/components/mail/composeBox/composeBoxCtrl.js
index d55723a..9c46092 100644
--- a/src/app/pages/mail/composeBox/composeBoxCtrl.js
+++ b/src/app/pages/components/mail/composeBox/composeBoxCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
     .controller('composeBoxCtrl', composeBoxCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/mail/composeBox/composeModal.js b/src/app/pages/components/mail/composeBox/composeModal.js
similarity index 83%
rename from src/app/pages/mail/composeBox/composeModal.js
rename to src/app/pages/components/mail/composeBox/composeModal.js
index 9aa5ab1..b940bed 100644
--- a/src/app/pages/mail/composeBox/composeModal.js
+++ b/src/app/pages/components/mail/composeBox/composeModal.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
     .service('composeModal', composeModal);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
       this.open = function(options){
         return $uibModal.open({
           animation: false,
-          templateUrl: 'app/pages/mail/composeBox/compose.html',
+          templateUrl: 'app/pages/components/mail/composeBox/compose.html',
           controller: 'composeBoxCtrl',
           controllerAs: 'boxCtrl',
           size: 'slim',
diff --git a/src/app/pages/mail/detail/MailDetailCtrl.js b/src/app/pages/components/mail/detail/MailDetailCtrl.js
similarity index 86%
rename from src/app/pages/mail/detail/MailDetailCtrl.js
rename to src/app/pages/components/mail/detail/MailDetailCtrl.js
index 765c493..42d3cbf 100644
--- a/src/app/pages/mail/detail/MailDetailCtrl.js
+++ b/src/app/pages/components/mail/detail/MailDetailCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
     .controller('MailDetailCtrl', MailDetailCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/mail/detail/mailDetail.html b/src/app/pages/components/mail/detail/mailDetail.html
similarity index 95%
rename from src/app/pages/mail/detail/mailDetail.html
rename to src/app/pages/components/mail/detail/mailDetail.html
index a8f73ed..f17ba83 100644
--- a/src/app/pages/mail/detail/mailDetail.html
+++ b/src/app/pages/components/mail/detail/mailDetail.html
@@ -1,7 +1,7 @@
 <div class="message-container">
   <div class="message">
     <div class="row">
-      <button ui-sref="mail.label({label : detailCtrl.label})"  type="button" class="back-button btn btn-default btn-with-icon"><i
+      <button ui-sref="components.mail.label({label : detailCtrl.label})"  type="button" class="back-button btn btn-default btn-with-icon"><i
           class="ion-chevron-left"></i>Back
       </button>
     </div>
diff --git a/src/app/pages/mail/list/MailListCtrl.js b/src/app/pages/components/mail/list/MailListCtrl.js
similarity index 86%
rename from src/app/pages/mail/list/MailListCtrl.js
rename to src/app/pages/components/mail/list/MailListCtrl.js
index 58c2f77..9330ffc 100644
--- a/src/app/pages/mail/list/MailListCtrl.js
+++ b/src/app/pages/components/mail/list/MailListCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
     .controller('MailListCtrl', MailListCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/mail/list/mailList.html b/src/app/pages/components/mail/list/mailList.html
similarity index 96%
rename from src/app/pages/mail/list/mailList.html
rename to src/app/pages/components/mail/list/mailList.html
index 040b6a1..981fddb 100644
--- a/src/app/pages/mail/list/mailList.html
+++ b/src/app/pages/components/mail/list/mailList.html
@@ -23,7 +23,7 @@
     <table>
       <tr ng-repeat="m in listCtrl.messages track by m.id | orderBy:'-date'"
           class="side-message-navigation-item little-human shineHover {{m.tag}}"
-          ui-sref="mail.detail({id: m.id, label: listCtrl.label})">
+          ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
         <td>
           <div class="mail-checkbox">
             <label class="checkbox-inline custom-checkbox nowrap margin-left">
diff --git a/src/app/pages/mail/mail.html b/src/app/pages/components/mail/mail.html
similarity index 93%
rename from src/app/pages/mail/mail.html
rename to src/app/pages/components/mail/mail.html
index 0e4e914..8f4be47 100644
--- a/src/app/pages/mail/mail.html
+++ b/src/app/pages/components/mail/mail.html
@@ -10,7 +10,7 @@
               </button>
             </div>
             <div ng-repeat="t in tabCtrl.tabs" ui-sref-active="active" class="mail-navigation"
-                 ui-sref="mail.label({label: t.label})" ng-click="selectTab(t.label)">
+                 ui-sref="components.mail.label({label: t.label})" ng-click="selectTab(t.label)">
               {{t.name}}<span class="new-mails" ng-show="t.newMails">{{t.newMails}}</span>
             </div>
             <div class="labels">
diff --git a/src/app/pages/mail/mail.module.js b/src/app/pages/components/mail/mail.module.js
similarity index 56%
rename from src/app/pages/mail/mail.module.js
rename to src/app/pages/components/mail/mail.module.js
index 11ba237..4a8e454 100644
--- a/src/app/pages/mail/mail.module.js
+++ b/src/app/pages/components/mail/mail.module.js
@@ -5,35 +5,34 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail', [])
+  angular.module('BlurAdmin.pages.components.mail', [])
     .config(routeConfig);
 
   /** @ngInject */
   function routeConfig($stateProvider,$urlRouterProvider) {
     $stateProvider
-        .state('mail', {
+        .state('components.mail', {
           url: '/mail',
           abstract: true,
-          templateUrl: 'app/pages/mail/mail.html',
+          templateUrl: 'app/pages/components/mail/mail.html',
           controller: "MailTabCtrl",
           controllerAs: "tabCtrl",
           title: 'Mail',
           sidebarMeta: {
-            icon: 'ion-ios-email-outline',
-            order: 500,
+            order: 0,
           },
-        }).state('mail.label', {
+        }).state('components.mail.label', {
           url: '/:label',
-          templateUrl: 'app/pages/mail/list/mailList.html',
+          templateUrl: 'app/pages/components/mail/list/mailList.html',
           controller: "MailListCtrl",
           controllerAs: "listCtrl"
-        }).state('mail.detail', {
+        }).state('components.mail.detail', {
           url: '/:label/:id',
-          templateUrl: 'app/pages/mail/detail/mailDetail.html',
+          templateUrl: 'app/pages/components/mail/detail/mailDetail.html',
           controller: "MailDetailCtrl",
           controllerAs: "detailCtrl"
         });
-    $urlRouterProvider.when('/mail','/mail/inbox');
+    $urlRouterProvider.when('/components/mail','/components/mail/inbox');
   }
 
 })();
diff --git a/src/app/pages/mail/mailMessages.js b/src/app/pages/components/mail/mailMessages.js
similarity index 99%
rename from src/app/pages/mail/mailMessages.js
rename to src/app/pages/components/mail/mailMessages.js
index 5497c98..90bb8f6 100644
--- a/src/app/pages/mail/mailMessages.js
+++ b/src/app/pages/components/mail/mailMessages.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.mail')
+  angular.module('BlurAdmin.pages.components.mail')
     .service('mailMessages', mailMessages);
 
   /** @ngInject */
diff --git a/src/app/pages/timeline/TimelineCtrl.js b/src/app/pages/components/timeline/TimelineCtrl.js
similarity index 95%
rename from src/app/pages/timeline/TimelineCtrl.js
rename to src/app/pages/components/timeline/TimelineCtrl.js
index 4729b93..5c9311f 100644
--- a/src/app/pages/timeline/TimelineCtrl.js
+++ b/src/app/pages/components/timeline/TimelineCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.timeline')
+  angular.module('BlurAdmin.pages.components.timeline')
       .controller('TimelineCtrl', TimelineCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/timeline/timeline.html b/src/app/pages/components/timeline/timeline.html
similarity index 100%
rename from src/app/pages/timeline/timeline.html
rename to src/app/pages/components/timeline/timeline.html
diff --git a/src/app/pages/timeline/timeline.module.js b/src/app/pages/components/timeline/timeline.module.js
similarity index 62%
rename from src/app/pages/timeline/timeline.module.js
rename to src/app/pages/components/timeline/timeline.module.js
index 618dc65..e111797 100644
--- a/src/app/pages/timeline/timeline.module.js
+++ b/src/app/pages/components/timeline/timeline.module.js
@@ -5,19 +5,19 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.timeline', [])
+  angular.module('BlurAdmin.pages.components.timeline', [])
     .config(routeConfig);
 
   /** @ngInject */
   function routeConfig($stateProvider) {
     $stateProvider
-      .state('timeline', {
+      .state('components.timeline', {
         url: '/timeline',
-        templateUrl: 'app/pages/timeline/timeline.html',
+        templateUrl: 'app/pages/components/timeline/timeline.html',
           title: 'Timeline',
           sidebarMeta: {
             icon: 'ion-ios-pulse',
-            order: 650,
+            order: 100,
           },
       });
   }
diff --git a/src/app/pages/tree/tree.html b/src/app/pages/components/tree/tree.html
similarity index 100%
rename from src/app/pages/tree/tree.html
rename to src/app/pages/components/tree/tree.html
diff --git a/src/app/pages/tree/tree.module.js b/src/app/pages/components/tree/tree.module.js
similarity index 58%
rename from src/app/pages/tree/tree.module.js
rename to src/app/pages/components/tree/tree.module.js
index 795da6b..7776411 100644
--- a/src/app/pages/tree/tree.module.js
+++ b/src/app/pages/components/tree/tree.module.js
@@ -5,17 +5,17 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.tree', []).config(routeConfig);
+  angular.module('BlurAdmin.pages.components.tree', []).config(routeConfig);
 
   /** @ngInject */
   function routeConfig($stateProvider) {
     $stateProvider
-        .state('ui.tree', {
+        .state('components.tree', {
           url: '/tree',
-          templateUrl: 'app/pages/tree/tree.html',
+          templateUrl: 'app/pages/components/tree/tree.html',
           title: 'Tree View',
           sidebarMeta: {
-            order: 900,
+            order: 200,
           },
         });
   }
diff --git a/src/app/pages/tree/treeCtrl.js b/src/app/pages/components/tree/treeCtrl.js
similarity index 99%
rename from src/app/pages/tree/treeCtrl.js
rename to src/app/pages/components/tree/treeCtrl.js
index cca076a..b5a7bb3 100644
--- a/src/app/pages/tree/treeCtrl.js
+++ b/src/app/pages/components/tree/treeCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.tree')
+  angular.module('BlurAdmin.pages.components.tree')
     .controller('treeCtrl', treeCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/form/form.module.js b/src/app/pages/form/form.module.js
index 99b4468..7411211 100644
--- a/src/app/pages/form/form.module.js
+++ b/src/app/pages/form/form.module.js
@@ -18,7 +18,7 @@
           title: 'Form Elements',
           sidebarMeta: {
             icon: 'ion-compose',
-            order: 300,
+            order: 200,
           },
         })
         .state('form.inputs', {
diff --git a/src/app/pages/maps/maps.module.js b/src/app/pages/maps/maps.module.js
index de15488..47c3984 100644
--- a/src/app/pages/maps/maps.module.js
+++ b/src/app/pages/maps/maps.module.js
@@ -18,7 +18,7 @@
           title: 'Maps',
           sidebarMeta: {
             icon: 'ion-ios-location-outline',
-            order: 600,
+            order: 500,
           },
         })
         .state('maps.gmap', {
diff --git a/src/app/pages/pages.module.js b/src/app/pages/pages.module.js
index ca34d20..a1a80c7 100644
--- a/src/app/pages/pages.module.js
+++ b/src/app/pages/pages.module.js
@@ -8,27 +8,14 @@
   angular.module('BlurAdmin.pages', [
     'ui.router',
 
-    'BlurAdmin.pages.alerts',
-    'BlurAdmin.pages.buttons',
-    'BlurAdmin.pages.charts',
     'BlurAdmin.pages.dashboard',
-    'BlurAdmin.pages.form',
-    'BlurAdmin.pages.grid',
-    'BlurAdmin.pages.icons',
-    'BlurAdmin.pages.mail',
-    'BlurAdmin.pages.maps',
-    'BlurAdmin.pages.modals',
-    'BlurAdmin.pages.notifications',
-    'BlurAdmin.pages.panels',
-    'BlurAdmin.pages.profile',
-    'BlurAdmin.pages.progressBars',
-    'BlurAdmin.pages.slider',
-    'BlurAdmin.pages.tables',
-    'BlurAdmin.pages.tree',
-    'BlurAdmin.pages.tabs',
-    'BlurAdmin.pages.typography',
     'BlurAdmin.pages.ui',
-    'BlurAdmin.pages.timeline',
+    'BlurAdmin.pages.components',
+    'BlurAdmin.pages.form',
+    'BlurAdmin.pages.tables',
+    'BlurAdmin.pages.charts',
+    'BlurAdmin.pages.maps',
+    'BlurAdmin.pages.profile',
   ])
       .config(routeConfig);
 
diff --git a/src/app/pages/profile/profile.module.js b/src/app/pages/profile/profile.module.js
index 1da0097..7e2c46d 100644
--- a/src/app/pages/profile/profile.module.js
+++ b/src/app/pages/profile/profile.module.js
@@ -15,11 +15,6 @@
           url: '/profile',
           templateUrl: 'app/pages/profile/profile.html',
           controller: 'ProfilePageCtrl',
-          title: 'User Profile',
-          sidebarMeta: {
-            icon: 'ion-person',
-            order: 700,
-          },
         });
   }
 
diff --git a/src/app/pages/tables/tables.module.js b/src/app/pages/tables/tables.module.js
index 7590917..542fe06 100644
--- a/src/app/pages/tables/tables.module.js
+++ b/src/app/pages/tables/tables.module.js
@@ -19,7 +19,7 @@
           title: 'Tables',
           sidebarMeta: {
             icon: 'ion-grid',
-            order: 200,
+            order: 300,
           },
         }).state('tables.basic', {
           url: '/basic',
diff --git a/src/app/pages/tabs/tabs.html b/src/app/pages/tabs/tabs.html
deleted file mode 100644
index 32d0761..0000000
--- a/src/app/pages/tabs/tabs.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <div class="row">
-    <div class="col-md-6" ng-include="'app/pages/tabs/mainTabs.html'"></div>
-    <div class="col-md-6 tabset-group" ng-include="'app/pages/tabs/sideTabs.html'"></div>
-  </div>
-  <div class="row accordions-row">
-    <div class="col-md-6" ng-include="'app/pages/tabs/sampleAccordion.html'"></div>
-    <div class="col-md-6" ng-include="'app/pages/tabs/sampleAccordion.html'"></div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/app/pages/alerts/alerts.html b/src/app/pages/ui/alerts/alerts.html
similarity index 100%
rename from src/app/pages/alerts/alerts.html
rename to src/app/pages/ui/alerts/alerts.html
diff --git a/src/app/pages/alerts/alerts.module.js b/src/app/pages/ui/alerts/alerts.module.js
similarity index 71%
rename from src/app/pages/alerts/alerts.module.js
rename to src/app/pages/ui/alerts/alerts.module.js
index 9df7bf3..5d2aa2b 100644
--- a/src/app/pages/alerts/alerts.module.js
+++ b/src/app/pages/ui/alerts/alerts.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.alerts', [])
+  angular.module('BlurAdmin.pages.ui.alerts', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,8 +13,8 @@
     $stateProvider
         .state('ui.alerts', {
           url: '/alerts',
-          templateUrl: 'app/pages/alerts/alerts.html',
-          title: 'Modals',
+          templateUrl: 'app/pages/ui/alerts/alerts.html',
+          title: 'Alerts',
           sidebarMeta: {
             order: 500,
           },
diff --git a/src/app/pages/buttons/ButtonPageCtrl.js b/src/app/pages/ui/buttons/ButtonPageCtrl.js
similarity index 86%
rename from src/app/pages/buttons/ButtonPageCtrl.js
rename to src/app/pages/ui/buttons/ButtonPageCtrl.js
index d485c32..cd669ba 100644
--- a/src/app/pages/buttons/ButtonPageCtrl.js
+++ b/src/app/pages/ui/buttons/ButtonPageCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.buttons')
+  angular.module('BlurAdmin.pages.ui.buttons')
       .controller('ButtonPageCtrl', ButtonPageCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/buttons/buttons.html b/src/app/pages/ui/buttons/buttons.html
similarity index 66%
rename from src/app/pages/buttons/buttons.html
rename to src/app/pages/ui/buttons/buttons.html
index f23f29a..bd20d57 100644
--- a/src/app/pages/buttons/buttons.html
+++ b/src/app/pages/ui/buttons/buttons.html
@@ -3,7 +3,7 @@
     <div class="col-md-12"
          ba-panel
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/buttons/widgets/buttons.html'"></div>
+      <div ng-include="'app/pages/ui/buttons/widgets/buttons.html'"></div>
     </div>
   </div>
 
@@ -13,13 +13,13 @@
           ba-panel
           ba-panel-title="Icon Buttons"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/buttons/widgets/iconButtons.html'"></div>
+        <div ng-include="'app/pages/ui/buttons/widgets/iconButtons.html'"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Large Buttons"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/buttons/widgets/largeButtons.html'"></div>
+        <div ng-include="'app/pages/ui/buttons/widgets/largeButtons.html'"></div>
       </div>
     </div>
     <div class="col-md-6">
@@ -27,13 +27,13 @@
           ba-panel
           ba-panel-title="Button Dropdowns"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/buttons/widgets/dropdowns.html'"></div>
+        <div ng-include="'app/pages/ui/buttons/widgets/dropdowns.html'"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Button Groups"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/buttons/widgets/buttonGroups.html'"></div>
+        <div ng-include="'app/pages/ui/buttons/widgets/buttonGroups.html'"></div>
       </div>
     </div>
   </div>
@@ -43,7 +43,7 @@
          ba-panel
          ba-panel-title="Progress Buttons"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/buttons/widgets/progressButtons.html'"></div>
+      <div ng-include="'app/pages/ui/buttons/widgets/progressButtons.html'"></div>
     </div>
   </div>
 
diff --git a/src/app/pages/buttons/buttons.module.js b/src/app/pages/ui/buttons/buttons.module.js
similarity index 78%
rename from src/app/pages/buttons/buttons.module.js
rename to src/app/pages/ui/buttons/buttons.module.js
index dc7098c..b02d827 100644
--- a/src/app/pages/buttons/buttons.module.js
+++ b/src/app/pages/ui/buttons/buttons.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.buttons', [])
+  angular.module('BlurAdmin.pages.ui.buttons', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.buttons', {
           url: '/buttons',
-          templateUrl: 'app/pages/buttons/buttons.html',
+          templateUrl: 'app/pages/ui/buttons/buttons.html',
           controller: 'ButtonPageCtrl',
           title: 'Buttons',
           sidebarMeta: {
diff --git a/src/app/pages/buttons/widgets/buttonGroups.html b/src/app/pages/ui/buttons/widgets/buttonGroups.html
similarity index 100%
rename from src/app/pages/buttons/widgets/buttonGroups.html
rename to src/app/pages/ui/buttons/widgets/buttonGroups.html
diff --git a/src/app/pages/buttons/widgets/buttons.html b/src/app/pages/ui/buttons/widgets/buttons.html
similarity index 100%
rename from src/app/pages/buttons/widgets/buttons.html
rename to src/app/pages/ui/buttons/widgets/buttons.html
diff --git a/src/app/pages/buttons/widgets/dropdowns.html b/src/app/pages/ui/buttons/widgets/dropdowns.html
similarity index 100%
rename from src/app/pages/buttons/widgets/dropdowns.html
rename to src/app/pages/ui/buttons/widgets/dropdowns.html
diff --git a/src/app/pages/buttons/widgets/iconButtons.html b/src/app/pages/ui/buttons/widgets/iconButtons.html
similarity index 100%
rename from src/app/pages/buttons/widgets/iconButtons.html
rename to src/app/pages/ui/buttons/widgets/iconButtons.html
diff --git a/src/app/pages/buttons/widgets/largeButtons.html b/src/app/pages/ui/buttons/widgets/largeButtons.html
similarity index 100%
rename from src/app/pages/buttons/widgets/largeButtons.html
rename to src/app/pages/ui/buttons/widgets/largeButtons.html
diff --git a/src/app/pages/buttons/widgets/progressButtons.html b/src/app/pages/ui/buttons/widgets/progressButtons.html
similarity index 100%
rename from src/app/pages/buttons/widgets/progressButtons.html
rename to src/app/pages/ui/buttons/widgets/progressButtons.html
diff --git a/src/app/pages/grid/baseGrid.html b/src/app/pages/ui/grid/baseGrid.html
similarity index 100%
rename from src/app/pages/grid/baseGrid.html
rename to src/app/pages/ui/grid/baseGrid.html
diff --git a/src/app/pages/grid/grid.html b/src/app/pages/ui/grid/grid.html
similarity index 72%
rename from src/app/pages/grid/grid.html
rename to src/app/pages/ui/grid/grid.html
index 0d2aeb4..1f4e74c 100644
--- a/src/app/pages/grid/grid.html
+++ b/src/app/pages/ui/grid/grid.html
@@ -5,7 +5,7 @@
          ba-panel
          ba-panel-title="Inline Form"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/grid/baseGrid.html'"></div>
+      <div ng-include="'app/pages/ui/grid/baseGrid.html'"></div>
     </div>
   </div>
 
diff --git a/src/app/pages/grid/grid.module.js b/src/app/pages/ui/grid/grid.module.js
similarity index 77%
rename from src/app/pages/grid/grid.module.js
rename to src/app/pages/ui/grid/grid.module.js
index 6659856..280153a 100644
--- a/src/app/pages/grid/grid.module.js
+++ b/src/app/pages/ui/grid/grid.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.grid', [])
+  angular.module('BlurAdmin.pages.ui.grid', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.grid', {
           url: '/grid',
-          templateUrl: 'app/pages/grid/grid.html',
+          templateUrl: 'app/pages/ui/grid/grid.html',
           title: 'Grid',
           sidebarMeta: {
             order: 400,
diff --git a/src/app/pages/icons/IconsPageCtrl.js b/src/app/pages/ui/icons/IconsPageCtrl.js
similarity index 99%
rename from src/app/pages/icons/IconsPageCtrl.js
rename to src/app/pages/ui/icons/IconsPageCtrl.js
index 6ac1d7e..2a69623 100644
--- a/src/app/pages/icons/IconsPageCtrl.js
+++ b/src/app/pages/ui/icons/IconsPageCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.icons')
+  angular.module('BlurAdmin.pages.ui.icons')
       .controller('IconsPageCtrl', IconsPageCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/icons/icons.html b/src/app/pages/ui/icons/icons.html
similarity index 63%
rename from src/app/pages/icons/icons.html
rename to src/app/pages/ui/icons/icons.html
index 2c760b2..96190c1 100644
--- a/src/app/pages/icons/icons.html
+++ b/src/app/pages/ui/icons/icons.html
@@ -6,13 +6,13 @@
           ba-panel
           ba-panel-title="Kameleon SVG Icons"
           ba-panel-class="with-scroll">
-        <div include-with-scope="app/pages/icons/widgets/kameleon.html"></div>
+        <div include-with-scope="app/pages/ui/icons/widgets/kameleon.html"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Socicon"
           ba-panel-class="with-scroll">
-        <div include-with-scope="app/pages/icons/widgets/socicon.html"></div>
+        <div include-with-scope="app/pages/ui/icons/widgets/socicon.html"></div>
       </div>
     </div>
     <div class="col-md-6">
@@ -20,19 +20,19 @@
           ba-panel
           ba-panel-title="Icons With Rounded Background"
           ba-panel-class="with-scroll">
-        <div include-with-scope="app/pages/icons/widgets/kameleonRounded.html"></div>
+        <div include-with-scope="app/pages/ui/icons/widgets/kameleonRounded.html"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="ionicons"
           ba-panel-class="with-scroll">
-        <div include-with-scope="app/pages/icons/widgets/ionicons.html"></div>
+        <div include-with-scope="app/pages/ui/icons/widgets/ionicons.html"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Font Awesome Icons"
           ba-panel-class="with-scroll">
-        <div include-with-scope="app/pages/icons/widgets/fontAwesomeIcons.html"></div>
+        <div include-with-scope="app/pages/ui/icons/widgets/fontAwesomeIcons.html"></div>
       </div>
     </div>
   </div>
diff --git a/src/app/pages/icons/icons.module.js b/src/app/pages/ui/icons/icons.module.js
similarity index 79%
rename from src/app/pages/icons/icons.module.js
rename to src/app/pages/ui/icons/icons.module.js
index fb85f90..0a5f291 100644
--- a/src/app/pages/icons/icons.module.js
+++ b/src/app/pages/ui/icons/icons.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.icons', [])
+  angular.module('BlurAdmin.pages.ui.icons', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.icons', {
           url: '/icons',
-          templateUrl: 'app/pages/icons/icons.html',
+          templateUrl: 'app/pages/ui/icons/icons.html',
           controller: 'IconsPageCtrl',
           title: 'Icons',
           sidebarMeta: {
diff --git a/src/app/pages/icons/widgets/fontAwesomeIcons.html b/src/app/pages/ui/icons/widgets/fontAwesomeIcons.html
similarity index 100%
rename from src/app/pages/icons/widgets/fontAwesomeIcons.html
rename to src/app/pages/ui/icons/widgets/fontAwesomeIcons.html
diff --git a/src/app/pages/icons/widgets/ionicons.html b/src/app/pages/ui/icons/widgets/ionicons.html
similarity index 100%
rename from src/app/pages/icons/widgets/ionicons.html
rename to src/app/pages/ui/icons/widgets/ionicons.html
diff --git a/src/app/pages/icons/widgets/kameleon.html b/src/app/pages/ui/icons/widgets/kameleon.html
similarity index 100%
rename from src/app/pages/icons/widgets/kameleon.html
rename to src/app/pages/ui/icons/widgets/kameleon.html
diff --git a/src/app/pages/icons/widgets/kameleonRounded.html b/src/app/pages/ui/icons/widgets/kameleonRounded.html
similarity index 100%
rename from src/app/pages/icons/widgets/kameleonRounded.html
rename to src/app/pages/ui/icons/widgets/kameleonRounded.html
diff --git a/src/app/pages/icons/widgets/socicon.html b/src/app/pages/ui/icons/widgets/socicon.html
similarity index 100%
rename from src/app/pages/icons/widgets/socicon.html
rename to src/app/pages/ui/icons/widgets/socicon.html
diff --git a/src/app/pages/modals/message-modals.html b/src/app/pages/ui/modals/message-modals.html
similarity index 100%
rename from src/app/pages/modals/message-modals.html
rename to src/app/pages/ui/modals/message-modals.html
diff --git a/src/app/pages/modals/modals.html b/src/app/pages/ui/modals/modals.html
similarity index 96%
rename from src/app/pages/modals/modals.html
rename to src/app/pages/ui/modals/modals.html
index ee480e9..8954914 100644
--- a/src/app/pages/modals/modals.html
+++ b/src/app/pages/ui/modals/modals.html
@@ -5,7 +5,7 @@
          ba-panel
          ba-panel-title="Modals"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/modals/modalsPanel.html'"></div>
+      <div ng-include="'app/pages/ui/modals/modalsPanel.html'"></div>
     </div>
   </div>
 
@@ -14,13 +14,13 @@
          ba-panel
          ba-panel-title="Message Modals"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/modals/message-modals.html'"></div>
+      <div ng-include="'app/pages/ui/modals/message-modals.html'"></div>
     </div>
     <div class="col-md-6"
          ba-panel
          ba-panel-title="Notifications"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/modals/notifications/notifications.html'"></div>
+      <div ng-include="'app/pages/ui/modals/notifications/notifications.html'"></div>
     </div>
   </div>
 
diff --git a/src/app/pages/modals/modals.module.js b/src/app/pages/ui/modals/modals.module.js
similarity index 77%
rename from src/app/pages/modals/modals.module.js
rename to src/app/pages/ui/modals/modals.module.js
index 9e1feed..6711219 100644
--- a/src/app/pages/modals/modals.module.js
+++ b/src/app/pages/ui/modals/modals.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.modals', [])
+  angular.module('BlurAdmin.pages.ui.modals', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.modals', {
           url: '/modals',
-          templateUrl: 'app/pages/modals/modals.html',
+          templateUrl: 'app/pages/ui/modals/modals.html',
           title: 'Modals',
           sidebarMeta: {
             order: 300,
diff --git a/src/app/pages/modals/modalsPanel.html b/src/app/pages/ui/modals/modalsPanel.html
similarity index 100%
rename from src/app/pages/modals/modalsPanel.html
rename to src/app/pages/ui/modals/modalsPanel.html
diff --git a/src/app/pages/modals/notifications/NotificationsCtrl.js b/src/app/pages/ui/modals/notifications/NotificationsCtrl.js
similarity index 93%
rename from src/app/pages/modals/notifications/NotificationsCtrl.js
rename to src/app/pages/ui/modals/notifications/NotificationsCtrl.js
index 95e8d54..f5a354e 100644
--- a/src/app/pages/modals/notifications/NotificationsCtrl.js
+++ b/src/app/pages/ui/modals/notifications/NotificationsCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.modals')
+  angular.module('BlurAdmin.pages.ui.modals')
       .controller('NotificationsCtrl', NotificationsCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/modals/notifications/notifications.html b/src/app/pages/ui/modals/notifications/notifications.html
similarity index 100%
rename from src/app/pages/modals/notifications/notifications.html
rename to src/app/pages/ui/modals/notifications/notifications.html
diff --git a/src/app/pages/notifications/NotificationsPageCtrl.js b/src/app/pages/ui/notifications/NotificationsPageCtrl.js
similarity index 98%
rename from src/app/pages/notifications/NotificationsPageCtrl.js
rename to src/app/pages/ui/notifications/NotificationsPageCtrl.js
index 522b0d1..6e48567 100644
--- a/src/app/pages/notifications/NotificationsPageCtrl.js
+++ b/src/app/pages/ui/notifications/NotificationsPageCtrl.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.notifications')
+  angular.module('BlurAdmin.pages.ui.notifications')
       .controller('NotificationsPageCtrl', NotificationsPageCtrl);
 
   /** @ngInject */
diff --git a/src/app/pages/notifications/notifications.html b/src/app/pages/ui/notifications/notifications.html
similarity index 100%
rename from src/app/pages/notifications/notifications.html
rename to src/app/pages/ui/notifications/notifications.html
diff --git a/src/app/pages/notifications/notifications.module.js b/src/app/pages/ui/notifications/notifications.module.js
similarity index 76%
rename from src/app/pages/notifications/notifications.module.js
rename to src/app/pages/ui/notifications/notifications.module.js
index 1bf17a7..2085290 100644
--- a/src/app/pages/notifications/notifications.module.js
+++ b/src/app/pages/ui/notifications/notifications.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.notifications', [])
+  angular.module('BlurAdmin.pages.ui.notifications', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.notifications', {
           url: '/notifications',
-          templateUrl: 'app/pages/notifications/notifications.html',
+          templateUrl: 'app/pages/ui/notifications/notifications.html',
           controller: 'NotificationsPageCtrl',
           title: 'Notifications',
           sidebarMeta: {
diff --git a/src/app/pages/panels/panels.html b/src/app/pages/ui/panels/panels.html
similarity index 100%
rename from src/app/pages/panels/panels.html
rename to src/app/pages/ui/panels/panels.html
diff --git a/src/app/pages/panels/panels.module.js b/src/app/pages/ui/panels/panels.module.js
similarity index 79%
rename from src/app/pages/panels/panels.module.js
rename to src/app/pages/ui/panels/panels.module.js
index 7924ae3..62c244c 100644
--- a/src/app/pages/panels/panels.module.js
+++ b/src/app/pages/ui/panels/panels.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.panels', [])
+  angular.module('BlurAdmin.pages.ui.panels', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.panels', {
           url: '/panels',
-          templateUrl: 'app/pages/panels/panels.html',
+          templateUrl: 'app/pages/ui/panels/panels.html',
           controller: 'NotificationsPageCtrl',
           title: 'Panels',
           sidebarMeta: {
diff --git a/src/app/pages/progressBars/progressBars.html b/src/app/pages/ui/progressBars/progressBars.html
similarity index 66%
rename from src/app/pages/progressBars/progressBars.html
rename to src/app/pages/ui/progressBars/progressBars.html
index 594b2a0..ff6ab9f 100644
--- a/src/app/pages/progressBars/progressBars.html
+++ b/src/app/pages/ui/progressBars/progressBars.html
@@ -6,13 +6,13 @@
           ba-panel
           ba-panel-title="Basic"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/progressBars/widgets/basic.html'"></div>
+        <div ng-include="'app/pages/ui/progressBars/widgets/basic.html'"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Striped"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/progressBars/widgets/striped.html'"></div>
+        <div ng-include="'app/pages/ui/progressBars/widgets/striped.html'"></div>
       </div>
     </div>
     <div class="col-md-6">
@@ -20,13 +20,13 @@
           ba-panel
           ba-panel-title="With label"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/progressBars/widgets/label.html'"></div>
+        <div ng-include="'app/pages/ui/progressBars/widgets/label.html'"></div>
       </div>
       <div
           ba-panel
           ba-panel-title="Animated"
           ba-panel-class="with-scroll">
-        <div ng-include="'app/pages/progressBars/widgets/animated.html'"></div>
+        <div ng-include="'app/pages/ui/progressBars/widgets/animated.html'"></div>
       </div>
     </div>
   </div>
@@ -36,7 +36,7 @@
          ba-panel
          ba-panel-title="Stacked"
          ba-panel-class="with-scroll">
-      <div ng-include="'app/pages/progressBars/widgets/stacked.html'"></div>
+      <div ng-include="'app/pages/ui/progressBars/widgets/stacked.html'"></div>
     </div>
   </div>
 
diff --git a/src/app/pages/progressBars/progressBars.module.js b/src/app/pages/ui/progressBars/progressBars.module.js
similarity index 75%
rename from src/app/pages/progressBars/progressBars.module.js
rename to src/app/pages/ui/progressBars/progressBars.module.js
index 6d1c6aa..27e52e4 100644
--- a/src/app/pages/progressBars/progressBars.module.js
+++ b/src/app/pages/ui/progressBars/progressBars.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.progressBars', [])
+  angular.module('BlurAdmin.pages.ui.progressBars', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.progressBars', {
           url: '/progressBars',
-          templateUrl: 'app/pages/progressBars/progressBars.html',
+          templateUrl: 'app/pages/ui/progressBars/progressBars.html',
           title: 'Progress Bars',
           sidebarMeta: {
             order: 600,
diff --git a/src/app/pages/progressBars/widgets/animated.html b/src/app/pages/ui/progressBars/widgets/animated.html
similarity index 100%
rename from src/app/pages/progressBars/widgets/animated.html
rename to src/app/pages/ui/progressBars/widgets/animated.html
diff --git a/src/app/pages/progressBars/widgets/basic.html b/src/app/pages/ui/progressBars/widgets/basic.html
similarity index 100%
rename from src/app/pages/progressBars/widgets/basic.html
rename to src/app/pages/ui/progressBars/widgets/basic.html
diff --git a/src/app/pages/progressBars/widgets/label.html b/src/app/pages/ui/progressBars/widgets/label.html
similarity index 100%
rename from src/app/pages/progressBars/widgets/label.html
rename to src/app/pages/ui/progressBars/widgets/label.html
diff --git a/src/app/pages/progressBars/widgets/stacked.html b/src/app/pages/ui/progressBars/widgets/stacked.html
similarity index 100%
rename from src/app/pages/progressBars/widgets/stacked.html
rename to src/app/pages/ui/progressBars/widgets/stacked.html
diff --git a/src/app/pages/progressBars/widgets/striped.html b/src/app/pages/ui/progressBars/widgets/striped.html
similarity index 100%
rename from src/app/pages/progressBars/widgets/striped.html
rename to src/app/pages/ui/progressBars/widgets/striped.html
diff --git a/src/app/pages/slider/slider.html b/src/app/pages/ui/slider/slider.html
similarity index 100%
rename from src/app/pages/slider/slider.html
rename to src/app/pages/ui/slider/slider.html
diff --git a/src/app/pages/slider/slider.module.js b/src/app/pages/ui/slider/slider.module.js
similarity index 76%
rename from src/app/pages/slider/slider.module.js
rename to src/app/pages/ui/slider/slider.module.js
index 6728305..0581a41 100644
--- a/src/app/pages/slider/slider.module.js
+++ b/src/app/pages/ui/slider/slider.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.slider', [])
+  angular.module('BlurAdmin.pages.ui.slider', [])
     .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.slider', {
           url: '/slider',
-          templateUrl: 'app/pages/slider/slider.html',
+          templateUrl: 'app/pages/ui/slider/slider.html',
           title: 'Sliders',
           sidebarMeta: {
             order: 1000,
diff --git a/src/app/pages/tabs/mainTabs.html b/src/app/pages/ui/tabs/mainTabs.html
similarity index 100%
rename from src/app/pages/tabs/mainTabs.html
rename to src/app/pages/ui/tabs/mainTabs.html
diff --git a/src/app/pages/tabs/sampleAccordion.html b/src/app/pages/ui/tabs/sampleAccordion.html
similarity index 100%
rename from src/app/pages/tabs/sampleAccordion.html
rename to src/app/pages/ui/tabs/sampleAccordion.html
diff --git a/src/app/pages/tabs/sideTabs.html b/src/app/pages/ui/tabs/sideTabs.html
similarity index 100%
rename from src/app/pages/tabs/sideTabs.html
rename to src/app/pages/ui/tabs/sideTabs.html
diff --git a/src/app/pages/ui/tabs/tabs.html b/src/app/pages/ui/tabs/tabs.html
new file mode 100644
index 0000000..046c293
--- /dev/null
+++ b/src/app/pages/ui/tabs/tabs.html
@@ -0,0 +1,10 @@
+<div>
+  <div class="row">
+    <div class="col-md-6" ng-include="'app/pages/ui/tabs/mainTabs.html'"></div>
+    <div class="col-md-6 tabset-group" ng-include="'app/pages/ui/tabs/sideTabs.html'"></div>
+  </div>
+  <div class="row accordions-row">
+    <div class="col-md-6" ng-include="'app/pages/ui/tabs/sampleAccordion.html'"></div>
+    <div class="col-md-6" ng-include="'app/pages/ui/tabs/sampleAccordion.html'"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/tabs/tabs.module.js b/src/app/pages/ui/tabs/tabs.module.js
similarity index 78%
rename from src/app/pages/tabs/tabs.module.js
rename to src/app/pages/ui/tabs/tabs.module.js
index 8e0d99d..a31f3d9 100644
--- a/src/app/pages/tabs/tabs.module.js
+++ b/src/app/pages/ui/tabs/tabs.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.tabs', [])
+  angular.module('BlurAdmin.pages.ui.tabs', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.tabs', {
           url: '/tabs',
-          templateUrl: 'app/pages/tabs/tabs.html',
+          templateUrl: 'app/pages/ui/tabs/tabs.html',
           title: 'Tabs and Accordions',
           sidebarMeta: {
             order: 800,
diff --git a/src/app/pages/typography/typography.html b/src/app/pages/ui/typography/typography.html
similarity index 100%
rename from src/app/pages/typography/typography.html
rename to src/app/pages/ui/typography/typography.html
diff --git a/src/app/pages/typography/typography.module.js b/src/app/pages/ui/typography/typography.module.js
similarity index 75%
rename from src/app/pages/typography/typography.module.js
rename to src/app/pages/ui/typography/typography.module.js
index f00703b..d178581 100644
--- a/src/app/pages/typography/typography.module.js
+++ b/src/app/pages/ui/typography/typography.module.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.typography', [])
+  angular.module('BlurAdmin.pages.ui.typography', [])
       .config(routeConfig);
 
   /** @ngInject */
@@ -13,7 +13,7 @@
     $stateProvider
         .state('ui.typography', {
           url: '/typography',
-          templateUrl: 'app/pages/typography/typography.html',
+          templateUrl: 'app/pages/ui/typography/typography.html',
           title: 'Typography',
           sidebarMeta: {
             order: 0,
diff --git a/src/app/pages/ui/ui.module.js b/src/app/pages/ui/ui.module.js
index ebb286b..a72e9a0 100644
--- a/src/app/pages/ui/ui.module.js
+++ b/src/app/pages/ui/ui.module.js
@@ -5,7 +5,19 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.pages.ui', [])
+  angular.module('BlurAdmin.pages.ui', [
+    'BlurAdmin.pages.ui.typography',
+    'BlurAdmin.pages.ui.buttons',
+    'BlurAdmin.pages.ui.icons',
+    'BlurAdmin.pages.ui.modals',
+    'BlurAdmin.pages.ui.grid',
+    'BlurAdmin.pages.ui.alerts',
+    'BlurAdmin.pages.ui.progressBars',
+    'BlurAdmin.pages.ui.notifications',
+    'BlurAdmin.pages.ui.tabs',
+    'BlurAdmin.pages.ui.slider',
+    'BlurAdmin.pages.ui.panels',
+  ])
       .config(routeConfig);
 
   /** @ngInject */
@@ -15,10 +27,10 @@
           url: '/ui',
           template : '<ui-view></ui-view>',
           abstract: true,
-          title: 'UI Elements',
+          title: 'UI Features',
           sidebarMeta: {
             icon: 'ion-android-laptop',
-            order: 400,
+            order: 100,
           },
         });
   }
diff --git a/src/app/theme/components/sidebar/sidebar.service.js b/src/app/theme/components/sidebar/sidebar.service.js
index fcf1cab..bf71e8b 100644
--- a/src/app/theme/components/sidebar/sidebar.service.js
+++ b/src/app/theme/components/sidebar/sidebar.service.js
@@ -7,19 +7,21 @@
   /** @ngInject */
   function sidebarService($state) {
     var staticMenuItems = [ {
-        title: 'Auth Pages',
-        icon: 'ion-log-out',
+        title: 'Pages',
+        icon: 'ion-document',
         subMenu: [{
             title: 'Sign In',
             root: 'auth.html'
           }, {
             title: 'Sign Up',
             root: 'reg.html'
+          }, {
+            title: 'User Profile',
+            root: '#/profile'
+          }, {
+            title: '404 Page',
+            root: '404.html'
           }]
-      }, {
-        title: '404 Page',
-        icon: 'ion-document',
-        root: '404.html'
       }, {
         title: 'Menu Level 1',
         icon: 'ion-ios-more',
@@ -31,7 +33,7 @@
               title: 'Menu Level 1.2.1'
             }]
           }]
-    }];
+      }];
 
     this.getMenuItems = function() {
       var states = defineMenuItemStates();