diff --git a/src/app/app.js b/src/app/app.js
index abfc782..1c40fd9 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -4,7 +4,7 @@ var blurAdminApp = angular.module('BlurAdmin', [
   'ui.sortable',
   'ngRoute',
   'ngTouch',
-  'BlurAdmin.layout',
+  'BlurAdmin.theme',
   'BlurAdmin.dashboard',
   'BlurAdmin.buttonsPage',
   'BlurAdmin.chartsPage',
@@ -19,20 +19,6 @@ var blurAdminApp = angular.module('BlurAdmin', [
   'toastr',
   'smart-table',
   'ui.slimscroll'
-]).config(['$routeProvider', 'toastrConfig', function ($routeProvider, toastrConfig) {
+]).config(['$routeProvider', function ($routeProvider) {
   $routeProvider.otherwise({redirectTo: '/dashboard'});
-
-  angular.extend(toastrConfig, {
-    closeButton: true,
-    closeHtml: '<button>&times;</button>',
-    timeOut: 5000,
-    autoDismiss: false,
-    containerId: 'toast-container',
-    maxOpened: 0,
-    newestOnTop: true,
-    positionClass: 'toast-top-right',
-    preventDuplicates: false,
-    preventOpenDuplicates: false,
-    target: 'body'
-  });
 }]);
\ No newline at end of file
diff --git a/src/app/common/controllers/mainCtrl.js b/src/app/common/controllers/mainCtrl.js
deleted file mode 100644
index db168ee..0000000
--- a/src/app/common/controllers/mainCtrl.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-blurAdminApp.controller('mainCtrl', ['$scope', '$timeout', function ($scope, $timeout) {
-  $timeout(function () {
-    $scope.finishLoading = true;
-  }, 1000);
-
-  $timeout(function () {
-    pageLoaded = true;
-  }, 4000);
-
-  $scope.isMenuCollapsed = window.innerWidth <= resWidthCollapseSidebar;
-}]);
\ No newline at end of file
diff --git a/src/app/common/directives/zoomIn.js b/src/app/common/directives/zoomIn.js
index 9fed91e..d0eff67 100644
--- a/src/app/common/directives/zoomIn.js
+++ b/src/app/common/directives/zoomIn.js
@@ -4,13 +4,13 @@
 
 'use strict';
 
-blurAdminApp.directive('zoomIn', ['$timeout', function ($timeout) {
+blurAdminApp.directive('zoomIn', ['$timeout', '$rootScope', function ($timeout, $rootScope) {
   return {
     restrict: 'A',
     link: function ($scope, elem) {
       var delay = 1000;
 
-      if (pageLoaded) {
+      if ($rootScope.$pageLoaded) {
         delay = 100;
       }
 
diff --git a/src/app/components/pageTop/pageTop.html b/src/app/components/pageTop/pageTop.html
index 9dd37b2..9f13987 100644
--- a/src/app/components/pageTop/pageTop.html
+++ b/src/app/components/pageTop/pageTop.html
@@ -1,6 +1,6 @@
 <div class="page-top clearfix" scroll-position="scrolled" max-height="50" ng-class="{'scrolled': scrolled}">
   <a href="#/dashboard" class="al-logo clearfix"><span>Blur</span>Admin</a>
-  <a href class="collapse-menu-link ion-navicon" ng-click="isMenuCollapsed=!isMenuCollapsed"></a>
+  <a href class="collapse-menu-link ion-navicon" ng-click="$isMenuCollapsed=!$isMenuCollapsed"></a>
 
   <div class="search">
     <i class="ion-ios-search-strong" ng-click="startSearch()"></i>
diff --git a/src/app/components/sidebar/sidebar.js b/src/app/components/sidebar/sidebar.js
index 0d64a5e..b4f5e41 100644
--- a/src/app/components/sidebar/sidebar.js
+++ b/src/app/components/sidebar/sidebar.js
@@ -4,10 +4,7 @@ blurAdminApp.directive('sidebar', function () {
   return {
     restrict: 'E',
     templateUrl: 'app/components/sidebar/sidebar.html',
-    scope: {
-      isMenuCollapsed: '='
-    },
-    controller: ['$scope', '$element', '$window', '$timeout', '$location', function ($scope, $element, $window, $timeout, $location) {
+    controller: ['$scope', '$element', '$window', '$timeout', '$location', '$rootScope', 'layoutSizes', function ($scope, $element, $window, $timeout, $location, $rootScope, layoutSizes) {
       $scope.menuItems = [
         {
           title: 'Dashboard',
@@ -133,14 +130,14 @@ blurAdminApp.directive('sidebar', function () {
       });
 
       $scope.menuExpand = function () {
-        $scope.isMenuCollapsed = false;
+        $rootScope.$isMenuCollapsed = false;
       };
 
       $scope.menuCollapse = function () {
-        $scope.isMenuCollapsed = true;
+        $rootScope.$isMenuCollapsed = true;
       };
 
-      $scope.$watch('isMenuCollapsed', function(newValue) {
+      $rootScope.$watch('$isMenuCollapsed', function(newValue) {
         if (!newValue && !$scope.selectElemTop) {
           changeSelectElemTopValue();
         }
@@ -148,10 +145,10 @@ blurAdminApp.directive('sidebar', function () {
 
       // watch window resize to change menu collapsed state if needed
       $(window).resize(function () {
-        var isMenuShouldCollapsed = $(window).width() <= resWidthCollapseSidebar;
+        var isMenuShouldCollapsed = $(window).width() <= layoutSizes.resWidthCollapseSidebar;
         if ($scope.isMenuShouldCollapsed !== isMenuShouldCollapsed) {
           $scope.$apply(function () {
-            $scope.isMenuCollapsed = isMenuShouldCollapsed;
+            $rootScope.$isMenuCollapsed = isMenuShouldCollapsed;
           });
         }
         $scope.isMenuShouldCollapsed = isMenuShouldCollapsed;
@@ -160,7 +157,7 @@ blurAdminApp.directive('sidebar', function () {
       $scope.toggleSubMenu = function ($event, item) {
         var submenu = $($event.currentTarget).next();
 
-        if ($scope.isMenuCollapsed) {
+        if (isMenuCollapsed.$isMenuCollapsed) {
           if (!item.slideRight) {
             $timeout(function () {
               item.slideRight = true;
@@ -193,8 +190,8 @@ blurAdminApp.directive('sidebar', function () {
       };
 
       $scope.collapseSidebarIfSmallRes = function () {
-        if (window.innerWidth <= resWidthCollapseSidebar) {
-          $scope.isMenuCollapsed = true;
+        if (window.innerWidth <= layoutSizes.resWidthCollapseSidebar) {
+          $rootScope.$isMenuCollapsed = true;
         }
       };
     }]
diff --git a/src/app/layout/amChartConfig.js b/src/app/theme/amChartConfig.js
similarity index 99%
rename from src/app/layout/amChartConfig.js
rename to src/app/theme/amChartConfig.js
index cfc1f7f..4858d75 100644
--- a/src/app/layout/amChartConfig.js
+++ b/src/app/theme/amChartConfig.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.layout')
+  angular.module('BlurAdmin.theme')
       .config(amChartConfig);
 
   /** @ngInject */
diff --git a/src/app/layout/layout.constants.js b/src/app/theme/theme.constants.js
similarity index 95%
rename from src/app/layout/layout.constants.js
rename to src/app/theme/theme.constants.js
index 7bb3c98..0be388a 100644
--- a/src/app/layout/layout.constants.js
+++ b/src/app/theme/theme.constants.js
@@ -5,7 +5,7 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.layout')
+  angular.module('BlurAdmin.theme')
       .constant('layoutColors', {
         primary:        '#41bee9',
         info:           '#5bc0de',
diff --git a/src/app/layout/layout.module.js b/src/app/theme/theme.module.js
similarity index 62%
rename from src/app/layout/layout.module.js
rename to src/app/theme/theme.module.js
index c0b46cf..e853b76 100644
--- a/src/app/layout/layout.module.js
+++ b/src/app/theme/theme.module.js
@@ -5,6 +5,8 @@
 (function () {
   'use strict';
 
-  angular.module('BlurAdmin.layout', []);
+  angular.module('BlurAdmin.theme', [
+    'toastr'
+  ]);
 
 })();
diff --git a/src/app/theme/theme.run.js b/src/app/theme/theme.run.js
new file mode 100644
index 0000000..387b4d6
--- /dev/null
+++ b/src/app/theme/theme.run.js
@@ -0,0 +1,24 @@
+/**
+ * @author v.lugovksy
+ * created on 15.12.2015
+ */
+(function () {
+  'use strict';
+
+  angular.module('BlurAdmin.theme')
+      .run(themeRun);
+
+  /** @ngInject */
+  function themeRun($timeout, $rootScope, layoutSizes) {
+    $timeout(function () {
+      $rootScope.$pageFinishedLoading = true;
+    }, 1000);
+
+    $timeout(function () {
+      $rootScope.$pageLoaded = true;
+    }, 4000);
+
+    $rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar;
+  }
+
+})();
\ No newline at end of file
diff --git a/src/app/theme/toastrLibConfig.js b/src/app/theme/toastrLibConfig.js
new file mode 100644
index 0000000..94593b1
--- /dev/null
+++ b/src/app/theme/toastrLibConfig.js
@@ -0,0 +1,27 @@
+/**
+ * @author v.lugovksy
+ * created on 15.12.2015
+ */
+(function () {
+  'use strict';
+
+  angular.module('BlurAdmin.theme')
+      .config(toastrLibConfig);
+
+  /** @ngInject */
+  function toastrLibConfig(toastrConfig) {
+    angular.extend(toastrConfig, {
+      closeButton: true,
+      closeHtml: '<button>&times;</button>',
+      timeOut: 5000,
+      autoDismiss: false,
+      containerId: 'toast-container',
+      maxOpened: 0,
+      newestOnTop: true,
+      positionClass: 'toast-top-right',
+      preventDuplicates: false,
+      preventOpenDuplicates: false,
+      target: 'body'
+    });
+  }
+})();
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 5306bab..0401ae0 100644
--- a/src/index.html
+++ b/src/index.html
@@ -24,11 +24,11 @@
   <!-- endinject -->
   <!-- endbuild -->
 </head>
-<body ng-controller="mainCtrl">
+<body>
 
-<main ng-if="finishLoading" ng-class="{ 'menu-collapsed': isMenuCollapsed }">
+<main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $isMenuCollapsed }">
 
-  <sidebar is-menu-collapsed="isMenuCollapsed"></sidebar>
+  <sidebar></sidebar>
   <page-top></page-top>
 
   <div class="al-main">
@@ -54,7 +54,7 @@
   <back-top></back-top>
 </main>
 
-<div id="preloader" ng-show="!finishLoading">
+<div id="preloader" ng-show="!$pageFinishedLoading">
   <div></div>
 </div>