diff --git a/gulpfile.js b/gulpfile.js
index 573f301..8a2d42a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,7 @@ var gulp = require('gulp');
 var sass = require('gulp-sass');
 var autoprefix = require('gulp-autoprefixer');
 var minifyCSS = require('gulp-minify-css');
-var concat = require("gulp-concat");
+var concat = require('gulp-concat');
 var changed = require('gulp-changed');
 var imagemin = require('gulp-imagemin');
 var stripDebug = require('gulp-strip-debug');
@@ -12,51 +12,51 @@ var eventStream = require('event-stream');
 var templateCache = require('gulp-angular-templatecache');
 var minifyHTML = require('gulp-minify-html');
 
-gulp.task("minify-404-css", function () {
-  var vendorFiles = gulp.src("./src/assets/css/lib/bootstrap.min.css");
-  var appFiles = gulp.src('./src/assets/css/404.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
+gulp.task('minify-404-css', function () {
+  var vendorFiles = gulp.src('src/assets/css/lib/bootstrap.min.css');
+  var appFiles = gulp.src('src/assets/css/404.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
 
   return eventStream.concat(vendorFiles, appFiles)
       .pipe(concat('404.min.css'))
       .pipe(autoprefix('last 4 version'))
       .pipe(minifyCSS())
-      .pipe(gulp.dest("./src/release/css/"));
+      .pipe(gulp.dest('src/release/css/'));
 });
 
-gulp.task("minify-auth-css", function () {
-  var vendorFiles = gulp.src("./src/assets/css/lib/bootstrap.min.css");
-  var appFiles = gulp.src('./src/assets/css/auth.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
+gulp.task('minify-auth-css', function () {
+  var vendorFiles = gulp.src('src/assets/css/lib/bootstrap.min.css');
+  var appFiles = gulp.src('src/assets/css/auth.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
 
   return eventStream.concat(vendorFiles, appFiles)
-      .pipe(concat("auth.min.css"))
+      .pipe(concat('auth.min.css'))
       .pipe(autoprefix('last 4 versions'))
       .pipe(minifyCSS())
-      .pipe(gulp.dest("./src/release/css/"))
+      .pipe(gulp.dest('src/release/css/'))
 });
 
-gulp.task("minify-css", ['minify-404-css', 'minify-auth-css'], function () {
-  var vendorFiles = gulp.src("./src/assets/css/lib/*.css");
-  var appFiles = gulp.src('./src/assets/css/main.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
+gulp.task('minify-css', ['minify-404-css', 'minify-auth-css'], function () {
+  var vendorFiles = gulp.src('src/assets/css/lib/*.css');
+  var appFiles = gulp.src('src/assets/css/main.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError));
 
   return eventStream.concat(vendorFiles, appFiles)
-      .pipe(concat("index.min.css"))
+      .pipe(concat('index.min.css'))
       .pipe(autoprefix('last 2 versions'))
       .pipe(minifyCSS())
-      .pipe(gulp.dest("./src/release/css/"))
+      .pipe(gulp.dest('src/release/css/'))
 });
 
 var imgSrc = [
-  './src/assets/img/*',
-  './src/assets/pictures/*',
-  './src/app/pages/dashboard/widgets/timeline/img/*',
-  './src/app/pages/profile/img/*',
-  './src/app/pages/icons/widgets/kameleon-img/*',
-  './src/assets/js/lib/amChart/images/*',
-  './src/app/pages/maps/widgets/leaflet/images/*',
+  'src/assets/img/*',
+  'src/assets/pictures/*',
+  'src/app/pages/dashboard/widgets/timeline/img/*',
+  'src/app/pages/profile/img/*',
+  'src/app/pages/icons/widgets/kameleon-img/*',
+  'src/assets/js/lib/amChart/images/*',
+  'src/app/pages/maps/widgets/leaflet/images/*',
 ];
 
 gulp.task('imagemin', function () {
-  var imgDst = './src/release/img/';
+  var imgDst = 'src/release/img/';
   return gulp
       .src(imgSrc)
       .pipe(changed(imgDst))
@@ -66,43 +66,51 @@ gulp.task('imagemin', function () {
 
 gulp.task('js', function () {
   var libSrc = [
-    "./src/assets/js/lib/jquery.min.js",
-    "./src/assets/js/lib/angular.min.js",
-    "./src/assets/js/global-variables.js",
-    "./src/assets/js/lib/**/*.js",
-    "./src/app/**/lib/**/*.js"
+    'src/assets/js/lib/jquery.min.js',
+    'src/assets/js/lib/angular.min.js',
+    'src/assets/js/global-variables.js',
+    'src/assets/js/lib/**/*.js',
+    'src/app/**/lib/**/*.js'
   ];
 
   var src = [
-    "./src/app/**/*.js",
-    "!./src/app/**/lib/**/*.js"
+    'src/app/**/*.js',
+    '!src/app/**/lib/**/*.js'
   ];
-  var dst = './src/release/js/';
+  var dst = 'src/release/js/';
 
   gulp.src(libSrc).pipe(concat('lib.min.js')).pipe(stripDebug()).pipe(uglify()).pipe(gulp.dest(dst));
   gulp.src(src).pipe(concat('bundle.min.js')).pipe(uglify()).pipe(gulp.dest(dst));
 });
 
 gulp.task('font', function () {
-  var fontSrc = './src/assets/css/fonts/*';
-  var fontDst = './src/release/fonts/';
+  var fontSrc = 'src/assets/css/fonts/*';
+  var fontDst = 'src/release/fonts/';
 
   gulp.src(fontSrc).pipe(gulp.dest(fontDst));
 });
 
 gulp.task('templateCache', function() {
   return gulp.src('src/app/**/*.html')
-      .pipe(minifyHTML({ conditionals: true, spare: true }))
-      .pipe(templateCache({ root: '/app/', module: 'BlurAdmin' }))
+      .pipe(minifyHTML({ conditionals: true, spare: true, empty: true }))
+      .pipe(templateCache({ root: 'app/', module: 'BlurAdmin' }))
       .pipe(gulp.dest('src/release/js'));
 });
 
-gulp.task("watch", function () {
-  gulp.watch(["./src/app/**/*.css", "./src/assets/**/*.css", "./**/*.scss "], ["minify-css"]);
-  gulp.watch(imgSrc, ["imagemin"]);
-  gulp.watch(["./src/app/**/*.js", "./src/assets/**/*.js"], ["js"]);
+gulp.task('html', function(){
+  return gulp.src('src/*.html')
+      .pipe(minifyHTML({ conditionals: true, spare: true, empty: true }))
+      .pipe(gulp.dest('src/release/'));
 });
 
-gulp.task("init", ["minify-css", "imagemin", "js", "font", 'templateCache']);
+gulp.task('watch', function () {
+  gulp.watch(['src/app/**/*.css', 'src/assets/**/*.css', './**/*.scss '], ['minify-css']);
+  gulp.watch(imgSrc, ['imagemin']);
+  gulp.watch(['src/app/**/*.js', 'src/assets/**/*.js'], ['js']);
+  gulp.watch(['src/app/**/*.html'], ['templateCache']);
+  gulp.watch(['src/*.html'], ['html']);
+});
+
+gulp.task('init', ['minify-css', 'imagemin', 'js', 'font', 'templateCache', 'html']);
 
 gulp.task('default', ['init']);
\ No newline at end of file
diff --git a/src/404.html b/src/404.html
index 5750349..815fe3d 100644
--- a/src/404.html
+++ b/src/404.html
@@ -8,11 +8,11 @@
 
   <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
-  <link rel="icon" type="image/png" sizes="32x32" href="release/img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="release/img/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="release/img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
 
-  <link rel="stylesheet" href="release/css/404.min.css">
+  <link rel="stylesheet" href="css/404.min.css">
 
   <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/src/app/app.js b/src/app/app.js
index b9662fb..a0fa052 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var blurAdminApp = angular.module('BlurAdmin', [
   'ui.sortable',
diff --git a/src/app/common/directives/animatedChange.js b/src/app/common/directives/animatedChange.js
index f1321d9..4cf8129 100644
--- a/src/app/common/directives/animatedChange.js
+++ b/src/app/common/directives/animatedChange.js
@@ -4,11 +4,11 @@
 
 'use strict';
 
-blurAdminApp.directive('animatedChange', ["$timeout", function ($timeout) {
+blurAdminApp.directive('animatedChange', ['$timeout', function ($timeout) {
   return {
     link: function (scope, element) {
       $timeout(function () {
-        var newValue = element.attr("new-value");
+        var newValue = element.attr('new-value');
         var oldvalue = parseInt(element.html());
 
         function changeValue(val) {
@@ -27,7 +27,7 @@ blurAdminApp.directive('animatedChange', ["$timeout", function ($timeout) {
           }
         }
         $timeout(function () {
-          element.next().find("i").addClass("show-arr");
+          element.next().find('i').addClass('show-arr');
         }, 500);
       }, 3500);
     }
diff --git a/src/app/common/directives/autoFocus.js b/src/app/common/directives/autoFocus.js
index 4a61c53..e15104e 100644
--- a/src/app/common/directives/autoFocus.js
+++ b/src/app/common/directives/autoFocus.js
@@ -1,6 +1,6 @@
 'use strict';
 
-blurAdminApp.directive('autoFocus', ["$timeout", "$parse", function ($timeout, $parse) {
+blurAdminApp.directive('autoFocus', ['$timeout', '$parse', function ($timeout, $parse) {
   return {
     link: function (scope, element, attrs) {
       var model = $parse(attrs.autoFocus);
diff --git a/src/app/common/directives/ngFileSelect.js b/src/app/common/directives/ngFileSelect.js
index 741e61f..c165de4 100644
--- a/src/app/common/directives/ngFileSelect.js
+++ b/src/app/common/directives/ngFileSelect.js
@@ -1,7 +1,7 @@
-blurAdminApp.directive("ngFileSelect", function () {
+blurAdminApp.directive('ngFileSelect', function () {
   return {
     link: function ($scope, el) {
-      el.bind("change", function (e) {
+      el.bind('change', function (e) {
         $scope.file = (e.srcElement || e.target).files[0];
         $scope.getFile();
       })
diff --git a/src/app/common/directives/zoomIn.js b/src/app/common/directives/zoomIn.js
index 4305d0e..9fed91e 100644
--- a/src/app/common/directives/zoomIn.js
+++ b/src/app/common/directives/zoomIn.js
@@ -15,8 +15,8 @@ blurAdminApp.directive('zoomIn', ['$timeout', function ($timeout) {
       }
 
       $timeout(function () {
-        elem.removeClass("invisible");
-        elem.addClass("animated zoomIn");
+        elem.removeClass('invisible');
+        elem.addClass('animated zoomIn');
       }, delay);
     }
   };
diff --git a/src/app/common/modules/upload.js b/src/app/common/modules/upload.js
index 844e9e8..dc24c67 100644
--- a/src/app/common/modules/upload.js
+++ b/src/app/common/modules/upload.js
@@ -1,7 +1,7 @@
 (function (blurAdminApp) {
 
-  blurAdminApp.factory("fileReader", fileReader);
-  fileReader.$inject = ["$q"];
+  blurAdminApp.factory('fileReader', fileReader);
+  fileReader.$inject = ['$q'];
 
   function fileReader ($q) {
     var onLoad = function(reader, deferred, scope) {
@@ -22,7 +22,7 @@
 
     var onProgress = function(reader, scope) {
       return function (event) {
-        scope.$broadcast("fileProgress",
+        scope.$broadcast('fileProgress',
             {
               total: event.total,
               loaded: event.loaded
diff --git a/src/app/components/backTop/backTop.js b/src/app/components/backTop/backTop.js
index dd6c7b7..329b5c6 100644
--- a/src/app/components/backTop/backTop.js
+++ b/src/app/components/backTop/backTop.js
@@ -9,6 +9,6 @@ blurAdminApp.directive('backTop', function () {
         'speed': 500
       });
     }],
-    templateUrl: '/app/components/backTop/backTop.html'
+    templateUrl: 'app/components/backTop/backTop.html'
   };
 });
diff --git a/src/app/components/msgCenter/msgCenter.html b/src/app/components/msgCenter/msgCenter.html
index 9443dfb..c887552 100644
--- a/src/app/components/msgCenter/msgCenter.html
+++ b/src/app/components/msgCenter/msgCenter.html
@@ -15,57 +15,11 @@
         <a href>Settings</a>
       </div>
       <div class="msg-list">
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-vova.png"></div>
+        <a href class="clearfix" ng-repeat="msg in notifications">
+          <div class="img-area"><img ng-src="{{ users[msg.userId].image || msg.image }}"></div>
           <div class="msg-area">
-            <div><strong>Vladimir</strong> posted a new article.</div>
-            <span>1 min ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-kostia.png"></div>
-          <div class="msg-area">
-            <div><strong>Konstantin</strong> changed his contact information.</div>
-            <span>2 hrs ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area">
-            <div class="orders"><i class="fa fa-shopping-cart"></i></div>
-          </div>
-          <div class="msg-area">
-            <div>New orders received.</div>
-            <span>5 hrs ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-andrey.png"></div>
-          <div class="msg-area">
-            <div><strong>Andrey</strong> replied to your comment.</div>
-            <span>1 day ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-nasta.png"></div>
-          <div class="msg-area">
-            <div>Today is <strong>Anastasiya</strong>'s birthday.</div>
-            <span>2 days ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area">
-            <div class="comments"><i class="fa fa-comments-o"></i></div>
-          </div>
-          <div class="msg-area">
-            <div>New comments on your post.</div>
-            <span>3 days ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-kostia.png"></div>
-          <div class="msg-area">
-            <div><strong>Konstantin</strong> invited you to join the event.</div>
-            <span>1 week ago</span>
+            <div ng-bind-html="getMessage(msg)"></div>
+            <span>{{ msg.time }}</span>
           </div>
         </a>
       </div>
@@ -75,67 +29,21 @@
   <li class="dropdown">
     <a href class="msg dropdown-toggle" data-toggle="dropdown">
       <i class="fa fa-envelope-o"></i><span>5</span>
-
       <div class="notification-ring"></div>
     </a>
-
     <div class="dropdown-menu top-dropdown-menu">
       <i class="dropdown-arr"></i>
-
       <div class="header clearfix">
         <strong>Messages</strong>
         <a href>Mark All as Read</a>
         <a href>Settings</a>
       </div>
       <div class="msg-list">
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-nasta.png"></div>
+        <a href class="clearfix" ng-repeat="msg in messages">
+          <div class="img-area"><img ng-src="{{ users[msg.userId].image || msg.image }}"></div>
           <div class="msg-area">
-            <div>After you get up and running, you can place Font Awesome icons just about...
-            </div>
-            <span>1 min ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-vova.png"></div>
-          <div class="msg-area">
-            <div>You asked, Font Awesome delivers with 40 shiny new icons in version 4.2.</div>
-            <span>2 hrs ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-kostia.png"></div>
-          <div class="msg-area">
-            <div>Want to request new icons? Here's how. Need vectors or want to use on the...</div>
-            <span>10 hrs ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-andrey.png"></div>
-          <div class="msg-area">
-            <div>Explore your passions and discover new ones by getting involved. Stretch your...</div>
-            <span>1 day ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-nasta.png"></div>
-          <div class="msg-area">
-            <div>Get to know who we are - from the inside out. From our history and culture, to the...</div>
-            <span>5 mins ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-kostia.png"></div>
-          <div class="msg-area">
-            <div>Need some support to reach your goals? Apply for scholarships across a variety of...</div>
-            <span>2 days ago</span>
-          </div>
-        </a>
-        <a href class="clearfix">
-          <div class="img-area"><img src="release/img/pic-vova.png"></div>
-          <div class="msg-area">
-            <div>Wrap the dropdown's trigger and the dropdown menu within .dropdown, or...</div>
-            <span>1 week ago</span>
+            <div>{{ msg.text }}</div>
+            <span>{{ msg.time }}</span>
           </div>
         </a>
       </div>
diff --git a/src/app/components/msgCenter/msgCenter.js b/src/app/components/msgCenter/msgCenter.js
index 4fee4f8..30d7633 100644
--- a/src/app/components/msgCenter/msgCenter.js
+++ b/src/app/components/msgCenter/msgCenter.js
@@ -3,6 +3,111 @@
 blurAdminApp.directive('msgCenter', function () {
   return {
     restrict: 'E',
-    templateUrl: '/app/components/msgCenter/msgCenter.html'
+    templateUrl: 'app/components/msgCenter/msgCenter.html',
+    controller: ['$scope', '$sce', function($scope, $sce){
+
+      $scope.users = {
+        0: {
+          name: 'Vladimir',
+          image: 'img/pic-vova.png'
+        },
+        1: {
+          name: 'Konstantin',
+          image: 'img/pic-kostia.png'
+        },
+        2: {
+          name: 'Andrey',
+          image: 'img/pic-andrey.png'
+        },
+        3: {
+          name: 'Anastasiya',
+          image: 'img/pic-nasta.png'
+        }
+      };
+
+      $scope.notifications = [
+        {
+          userId: 0,
+          template: '&name posted a new article.',
+          time: '1 min ago'
+        },
+        {
+          userId: 1,
+          template: '&name changed his contact information.',
+          time: '2 hrs ago'
+        },
+        {
+          image: 'img/shopping-cart.svg',
+          template: 'New orders received.',
+          time: '5 hrs ago'
+        },
+        {
+          userId: 2,
+          template: '&name replied to your comment.',
+          time: '1 day ago'
+        },
+        {
+          userId: 3,
+          template: 'Today is &name\'s birthday.',
+          time: '2 days ago'
+        },
+        {
+          image: 'img/comments.svg',
+          template: 'New comments on your post.',
+          time: '3 days ago'
+        },
+        {
+          userId: 1,
+          template: '&name invited you to join the event.',
+          time: '1 week ago'
+        }
+      ];
+
+      $scope.messages = [
+        {
+          userId: 3,
+          text: 'After you get up and running, you can place Font Awesome icons just about...',
+          time: '1 min ago'
+        },
+        {
+          userId: 0,
+          text: 'You asked, Font Awesome delivers with 40 shiny new icons in version 4.2.',
+          time: '2 hrs ago'
+        },
+        {
+          userId: 1,
+          text: 'Want to request new icons? Here\'s how. Need vectors or want to use on the...',
+          time: '10 hrs ago'
+        },
+        {
+          userId: 2,
+          text: 'Explore your passions and discover new ones by getting involved. Stretch your...',
+          time: '1 day ago'
+        },
+        {
+          userId: 3,
+          text: 'Get to know who we are - from the inside out. From our history and culture, to the...',
+          time: '1 day ago'
+        },
+        {
+          userId: 1,
+          text: 'Need some support to reach your goals? Apply for scholarships across a variety of...',
+          time: '2 days ago'
+        },
+        {
+          userId: 0,
+          text: 'Wrap the dropdown\'s trigger and the dropdown menu within .dropdown, or...',
+          time: '1 week ago'
+        }
+      ];
+
+      $scope.getMessage = function(msg) {
+        var text = msg.template;
+        if (msg.userId || msg.userId === 0) {
+          text = text.replace('&name', '<strong>' + $scope.users[msg.userId].name + '</strong>');
+        }
+        return $sce.trustAsHtml(text);
+      };
+    }]
   };
 });
diff --git a/src/app/components/pageTop/pageTop.html b/src/app/components/pageTop/pageTop.html
index f4d2ae2..991f1c1 100644
--- a/src/app/components/pageTop/pageTop.html
+++ b/src/app/components/pageTop/pageTop.html
@@ -4,7 +4,7 @@
     <div class="user-profile clearfix">
       <div class="al-user-profile dropdown">
         <a href class="dropdown-toggle" data-toggle="dropdown">
-          <img src="release/img/pic-profile-small.png">
+          <img src="img/pic-profile-small.png">
         </a>
         <div class="dropdown-menu top-dropdown-menu profile-dropdown">
           <i class="dropdown-arr"></i>
diff --git a/src/app/components/pageTop/pageTop.js b/src/app/components/pageTop/pageTop.js
index 6e0b40e..acbe2f4 100644
--- a/src/app/components/pageTop/pageTop.js
+++ b/src/app/components/pageTop/pageTop.js
@@ -1,26 +1,26 @@
 'use strict';
 
-blurAdminApp.directive('pageTop', ["$location", function ($location) {
+blurAdminApp.directive('pageTop', ['$location', function ($location) {
   return {
     restrict: 'E',
-    templateUrl: '/app/components/pageTop/pageTop.html',
+    templateUrl: 'app/components/pageTop/pageTop.html',
     link: function ($scope) {
       $scope.pages = {
-        "/dashboard": "Dashboard",
-        "/page": "Default Page",
-        "/404": "Page Not Found",
-        "/buttons": "Buttons",
-        "/charts": "Charts",
-        "/grid": "Grid",
-        "/icons": "Icons",
-        "/login": "Authentication",
-        "/maps": "Maps",
-        "/modals": "Modals",
-        "/profile": "User Profile",
-        "/tables": "Tables",
-        "/typography": "Typography",
-        "/form-layouts": "Form Layouts",
-        "/form-inputs": "Form Inputs"
+        '/dashboard': 'Dashboard',
+        '/page': 'Default Page',
+        '/404': 'Page Not Found',
+        '/buttons': 'Buttons',
+        '/charts': 'Charts',
+        '/grid': 'Grid',
+        '/icons': 'Icons',
+        '/login': 'Authentication',
+        '/maps': 'Maps',
+        '/modals': 'Modals',
+        '/profile': 'User Profile',
+        '/tables': 'Tables',
+        '/typography': 'Typography',
+        '/form-layouts': 'Form Layouts',
+        '/form-inputs': 'Form Inputs'
       };
 
       $scope.$watch(function () {
diff --git a/src/app/components/pieCharts/pieCharts.js b/src/app/components/pieCharts/pieCharts.js
index a7b27ee..4c179b7 100644
--- a/src/app/components/pieCharts/pieCharts.js
+++ b/src/app/components/pieCharts/pieCharts.js
@@ -3,7 +3,7 @@
 blurAdminApp.directive('pieCharts', function () {
   return {
     restrict: 'E',
-    controller: ["$scope", "$element", "$window", "$timeout", function ($scope, $element, $window, $timeout) {
+    controller: ['$scope', '$element', '$window', '$timeout', function ($scope, $element, $window, $timeout) {
       function getRandomArbitrary(min, max) {
         return Math.random() * (max - min) + min;
       }
@@ -16,7 +16,7 @@ blurAdminApp.directive('pieCharts', function () {
             onStep: function (from, to, percent) {
               $(this.el).find('.percent').text(Math.round(percent));
             },
-            barColor: chart.attr("rel"),
+            barColor: chart.attr('rel'),
             trackColor: 'rgba(0,0,0,0)',
             size: 84,
             scaleLength: 0,
@@ -30,10 +30,10 @@ blurAdminApp.directive('pieCharts', function () {
       }
 
       function updatePieCharts() {
-        var chart1 = window.chart = $("#chart1").find('.chart').data('easyPieChart');
-        var chart2 = window.chart = $("#chart2").find('.chart').data('easyPieChart');
-        var chart3 = window.chart = $("#chart3").find('.chart').data('easyPieChart');
-        var chart4 = window.chart = $("#chart4").find('.chart').data('easyPieChart');
+        var chart1 = window.chart = $('#chart1').find('.chart').data('easyPieChart');
+        var chart2 = window.chart = $('#chart2').find('.chart').data('easyPieChart');
+        var chart3 = window.chart = $('#chart3').find('.chart').data('easyPieChart');
+        var chart4 = window.chart = $('#chart4').find('.chart').data('easyPieChart');
         chart1.update(getRandomArbitrary(60, 100));
         chart2.update(getRandomArbitrary(60, 100));
         chart3.update(getRandomArbitrary(60, 100));
@@ -46,6 +46,6 @@ blurAdminApp.directive('pieCharts', function () {
         updatePieCharts();
       }, 2000);
     }],
-    templateUrl: '/app/components/pieCharts/pieCharts.html'
+    templateUrl: 'app/components/pieCharts/pieCharts.html'
   };
 });
diff --git a/src/app/components/sidebar/_sidebar.scss b/src/app/components/sidebar/_sidebar.scss
index b57e44f..9292d6e 100644
--- a/src/app/components/sidebar/_sidebar.scss
+++ b/src/app/components/sidebar/_sidebar.scss
@@ -72,6 +72,7 @@ a.al-sidebar-list-link {
   line-height: 42px;
   white-space: nowrap;
   overflow: hidden;
+  cursor: pointer;
   &:hover {
     color: $primary;
     b {
diff --git a/src/app/components/sidebar/sidebar.js b/src/app/components/sidebar/sidebar.js
index 81b67df..69d932c 100644
--- a/src/app/components/sidebar/sidebar.js
+++ b/src/app/components/sidebar/sidebar.js
@@ -3,7 +3,7 @@
 blurAdminApp.directive('sidebar', function () {
   return {
     restrict: 'E',
-    templateUrl: '/app/components/sidebar/sidebar.html',
+    templateUrl: 'app/components/sidebar/sidebar.html',
     controller: ['$scope', '$element', '$window', '$timeout', '$location', function ($scope, $element, $window, $timeout, $location) {
 
       var resWidthCollapseSidebar = 1200;
@@ -13,75 +13,75 @@ blurAdminApp.directive('sidebar', function () {
 
       $scope.menuItems = [
         {
-          title: "Dashboard",
-          icon: "ion-android-home",
-          root: "#/dashboard"
+          title: 'Dashboard',
+          icon: 'ion-android-home',
+          root: '#/dashboard'
         },
         {
-          title: "Charts",
-          icon: "ion-stats-bars",
-          root: "#/charts"
+          title: 'Charts',
+          icon: 'ion-stats-bars',
+          root: '#/charts'
         },
         {
-          title: "Tables",
-          icon: "ion-grid",
-          root: "#/tables"
+          title: 'Tables',
+          icon: 'ion-grid',
+          root: '#/tables'
         },
         {
-          title: "Form Elements",
-          icon: "ion-compose",
+          title: 'Form Elements',
+          icon: 'ion-compose',
           subMenu: [
             {
-              title: "Inputs",
-              root: "#/form-inputs"
+              title: 'Inputs',
+              root: '#/form-inputs'
             },
             {
-              title: "Form Layouts",
-              root: "#/form-layouts"
+              title: 'Form Layouts',
+              root: '#/form-layouts'
             }
           ]
         },
         {
-          title: "UI Elements",
-          icon: "ion-android-laptop",
+          title: 'UI Elements',
+          icon: 'ion-android-laptop',
           subMenu: [
             {
-              title: "Typography",
-              root: "#/typography"
+              title: 'Typography',
+              root: '#/typography'
             },
             {
-              title: "Buttons",
-              root: "#/buttons"
+              title: 'Buttons',
+              root: '#/buttons'
             },
             {
-              title: "Icons",
-              root: "#/icons"
+              title: 'Icons',
+              root: '#/icons'
             },
             {
-              title: "Modals",
-              root: "#/modals"
+              title: 'Modals',
+              root: '#/modals'
             }
           ]
         },
         {
-          title: "Maps",
-          icon: "ion-ios-location-outline",
-          root: "#/maps"
+          title: 'Maps',
+          icon: 'ion-ios-location-outline',
+          root: '#/maps'
         },
         {
-          title: "User Profile",
-          icon: "ion-person",
-          root: "#/profile"
+          title: 'User Profile',
+          icon: 'ion-person',
+          root: '#/profile'
         },
         {
-          title: "Login Page",
-          icon: "ion-log-out",
-          root: "auth.html"
+          title: 'Login Page',
+          icon: 'ion-log-out',
+          root: 'auth.html'
         },
         {
-          title: "404 Page",
-          icon: "ion-document",
-          root: "404.html"
+          title: '404 Page',
+          icon: 'ion-document',
+          root: '404.html'
         }
       ];
 
@@ -96,12 +96,12 @@ blurAdminApp.directive('sidebar', function () {
 
       function selectMenuItem() {
         $.each($scope.menuItems, function (index, value) {
-          value.selected = value.root === "#" + $location.$$url;
+          value.selected = value.root === '#' + $location.$$url;
 
           if (value.subMenu) {
             var hasSelectedSubmenu = false;
             $.each(value.subMenu, function (subIndex, subValue) {
-              subValue.selected = subValue.root === "#" + $location.$$url;
+              subValue.selected = subValue.root === '#' + $location.$$url;
               if (subValue.selected) {
                 hasSelectedSubmenu = true;
               }
diff --git a/src/app/components/widgets/widgets.js b/src/app/components/widgets/widgets.js
index 7032dfc..1a4fdd5 100644
--- a/src/app/components/widgets/widgets.js
+++ b/src/app/components/widgets/widgets.js
@@ -4,9 +4,9 @@ blurAdminApp.directive('widgets', function () {
   return {
     restrict: 'EA',
     scope: {
-      ngModel: "="
+      ngModel: '='
     },
-    templateUrl: '/app/components/widgets/widgets.html',
+    templateUrl: 'app/components/widgets/widgets.html',
     replace: true,
     link: function (scope, element, attrs, ctrls) {
     }
diff --git a/src/app/pages/buttons/buttons.js b/src/app/pages/buttons/buttons.js
index 4a81fa6..65cd35d 100644
--- a/src/app/pages/buttons/buttons.js
+++ b/src/app/pages/buttons/buttons.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.buttonsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/buttons', {
-        templateUrl: '/app/pages/buttons/buttons.html',
+        templateUrl: 'app/pages/buttons/buttons.html',
         controller: 'buttonsPageCtrl'
       });
     }])
@@ -14,7 +14,7 @@ angular.module('BlurAdmin.buttonsPage', ['ngRoute'])
           widgets: [
             [
               {
-                url: "/app/pages/buttons/widgets/buttons.html"
+                url: 'app/pages/buttons/widgets/buttons.html'
               }
             ]
           ]
@@ -23,22 +23,22 @@ angular.module('BlurAdmin.buttonsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Icon Buttons",
-                url: "/app/pages/buttons/widgets/iconButtons.html"
+                title: 'Icon Buttons',
+                url: 'app/pages/buttons/widgets/iconButtons.html'
               },
               {
-                title: "Large Buttons",
-                url: "/app/pages/buttons/widgets/largeButtons.html"
+                title: 'Large Buttons',
+                url: 'app/pages/buttons/widgets/largeButtons.html'
               }
             ],
             [
               {
-                title: "Button Dropdowns",
-                url: "/app/pages/buttons/widgets/dropdowns.html"
+                title: 'Button Dropdowns',
+                url: 'app/pages/buttons/widgets/dropdowns.html'
               },
               {
-                title: "Button Groups",
-                url: "/app/pages/buttons/widgets/buttonGroups.html"
+                title: 'Button Groups',
+                url: 'app/pages/buttons/widgets/buttonGroups.html'
               }
             ]
           ]
diff --git a/src/app/pages/charts/charts.js b/src/app/pages/charts/charts.js
index c513caf..8491d4b 100644
--- a/src/app/pages/charts/charts.js
+++ b/src/app/pages/charts/charts.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.chartsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/charts', {
-        templateUrl: '/app/pages/charts/charts.html',
+        templateUrl: 'app/pages/charts/charts.html',
         controller: 'chartsPageCtrl'
       });
     }])
@@ -14,22 +14,22 @@ angular.module('BlurAdmin.chartsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Bar Chart",
-                url: '/app/pages/charts/widgets/barChart/barChart.html'
+                title: 'Bar Chart',
+                url: 'app/pages/charts/widgets/barChart/barChart.html'
               },
               {
                 title: 'Line Chart',
-                url: '/app/pages/charts/widgets/lineChart/lineChart.html'
+                url: 'app/pages/charts/widgets/lineChart/lineChart.html'
               }
             ],
             [
               {
                 title: 'Area Chart',
-                url: '/app/pages/charts/widgets/areaChart/areaChart.html'
+                url: 'app/pages/charts/widgets/areaChart/areaChart.html'
               },
               {
                 title: 'Funnel Chart',
-                url: '/app/pages/charts/widgets/funnelChart/funnelChart.html'
+                url: 'app/pages/charts/widgets/funnelChart/funnelChart.html'
               }
             ]
           ]
@@ -39,7 +39,7 @@ angular.module('BlurAdmin.chartsPage', ['ngRoute'])
             [
               {
                 title: 'Pie Chart',
-                url: '/app/pages/charts/widgets/pieChart/pieChart.html'
+                url: 'app/pages/charts/widgets/pieChart/pieChart.html'
               }
             ]
           ]
diff --git a/src/app/pages/charts/widgets/areaChart/areaChart.js b/src/app/pages/charts/widgets/areaChart/areaChart.js
index c150060..17f91ba 100644
--- a/src/app/pages/charts/widgets/areaChart/areaChart.js
+++ b/src/app/pages/charts/widgets/areaChart/areaChart.js
@@ -3,58 +3,58 @@
 blurAdminApp.controller('areaChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var areaChart = AmCharts.makeChart(id, {
-    type: "serial",
-    theme: "blur",
+    type: 'serial',
+    theme: 'blur',
     dataProvider: [
       {
         lineColor: colorDanger,
-        date: "2012-01-01",
+        date: '2012-01-01',
         duration: 408
       },
       {
-        date: "2012-01-02",
+        date: '2012-01-02',
         duration: 482
       },
       {
-        date: "2012-01-03",
+        date: '2012-01-03',
         duration: 562
       },
       {
-        date: "2012-01-04",
+        date: '2012-01-04',
         duration: 379
       },
       {
         lineColor: colorSuccess,
-        date: "2012-01-05",
+        date: '2012-01-05',
         duration: 501
       },
       {
-        date: "2012-01-06",
+        date: '2012-01-06',
         duration: 443
       },
       {
-        date: "2012-01-07",
+        date: '2012-01-07',
         duration: 405
       },
       {
-        date: "2012-01-08",
+        date: '2012-01-08',
         duration: 309,
         lineColor: colorPrimary
       },
       {
-        date: "2012-01-09",
+        date: '2012-01-09',
         duration: 287
       },
       {
-        date: "2012-01-10",
+        date: '2012-01-10',
         duration: 485
       },
       {
-        date: "2012-01-11",
+        date: '2012-01-11',
         duration: 890
       },
       {
-        date: "2012-01-12",
+        date: '2012-01-12',
         duration: 810
       }
     ],
@@ -65,67 +65,67 @@ blurAdminApp.controller('areaChartCtrl', ['$scope', '$timeout', '$element', func
     },
     valueAxes: [
       {
-        duration: "mm",
+        duration: 'mm',
         durationUnits: {
-          hh: "h ",
-          mm: "min"
+          hh: 'h ',
+          mm: 'min'
         },
         axisAlpha: 0
       }
     ],
     graphs: [
       {
-        bullet: "square",
+        bullet: 'square',
         bulletBorderAlpha: 1,
         bulletBorderThickness: 1,
         fillAlphas: 0.3,
-        fillColorsField: "lineColor",
-        legendValueText: "[[value]]",
-        lineColorField: "lineColor",
-        title: "duration",
-        valueField: "duration"
+        fillColorsField: 'lineColor',
+        legendValueText: '[[value]]',
+        lineColorField: 'lineColor',
+        title: 'duration',
+        valueField: 'duration'
       }
     ],
 
     chartCursor: {
-      categoryBalloonDateFormat: "YYYY MMM DD",
+      categoryBalloonDateFormat: 'YYYY MMM DD',
       cursorAlpha: 0,
       fullWidth: true
     },
-    dataDateFormat: "YYYY-MM-DD",
-    categoryField: "date",
+    dataDateFormat: 'YYYY-MM-DD',
+    categoryField: 'date',
     categoryAxis: {
       dateFormats: [
         {
-          period: "DD",
-          format: "DD"
+          period: 'DD',
+          format: 'DD'
         },
         {
-          period: "WW",
-          format: "MMM DD"
+          period: 'WW',
+          format: 'MMM DD'
         },
         {
-          period: "MM",
-          format: "MMM"
+          period: 'MM',
+          format: 'MMM'
         },
         {
-          period: "YYYY",
-          format: "YYYY"
+          period: 'YYYY',
+          format: 'YYYY'
         }
       ],
       parseDates: true,
       autoGridCount: false,
-      axisColor: "#555555",
+      axisColor: '#555555',
       gridAlpha: 0,
       gridCount: 50
     },
     export: {
       enabled: true
     },
-    pathToImages: 'release/img/'
+    pathToImages: 'img/'
   });
 
-  areaChart.addListener("dataUpdated", zoomAreaChart);
+  areaChart.addListener('dataUpdated', zoomAreaChart);
 
   function zoomAreaChart() {
     areaChart.zoomToDates(new Date(2012, 0, 3), new Date(2012, 0, 11));
diff --git a/src/app/pages/charts/widgets/barChart/barChart.js b/src/app/pages/charts/widgets/barChart/barChart.js
index 228f7d2..fc7a57f 100644
--- a/src/app/pages/charts/widgets/barChart/barChart.js
+++ b/src/app/pages/charts/widgets/barChart/barChart.js
@@ -3,37 +3,37 @@
 blurAdminApp.controller('barChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var barChart = AmCharts.makeChart(id, {
-    type: "serial",
-    theme: "blur",
+    type: 'serial',
+    theme: 'blur',
     dataProvider: [
       {
-        country: "USA",
+        country: 'USA',
         visits: 3025,
         color: colorPrimary
       },
       {
-        country: "China",
+        country: 'China',
         visits: 1882,
         color: colorDanger
 
       },
       {
-        country: "Japan",
+        country: 'Japan',
         visits: 1809,
         color: colorPrimaryLight
       },
       {
-        country: "Germany",
+        country: 'Germany',
         visits: 1322,
         color: colorSuccess
       },
       {
-        country: "UK",
+        country: 'UK',
         visits: 1122,
         color: colorWarning
       },
       {
-        country: "France",
+        country: 'France',
         visits: 1114,
         color: colorDefault
       }
@@ -41,19 +41,19 @@ blurAdminApp.controller('barChartCtrl', ['$scope', '$timeout', '$element', funct
     valueAxes: [
       {
         axisAlpha: 0,
-        position: "left",
-        title: "Visitors from country"
+        position: 'left',
+        title: 'Visitors from country'
       }
     ],
     startDuration: 1,
     graphs: [
       {
-        balloonText: "<b>[[category]]: [[value]]</b>",
-        fillColorsField: "color",
+        balloonText: '<b>[[category]]: [[value]]</b>',
+        fillColorsField: 'color',
         fillAlphas: 0.9,
         lineAlpha: 0.2,
-        type: "column",
-        valueField: "visits"
+        type: 'column',
+        valueField: 'visits'
       }
     ],
     chartCursor: {
@@ -61,15 +61,15 @@ blurAdminApp.controller('barChartCtrl', ['$scope', '$timeout', '$element', funct
       cursorAlpha: 0,
       zoomable: false
     },
-    categoryField: "country",
+    categoryField: 'country',
     categoryAxis: {
-      gridPosition: "start",
+      gridPosition: 'start',
       labelRotation: 45
     },
     export: {
       enabled: true
     },
-    creditsPosition: "top-right",
-    pathToImages: "release/img/"
+    creditsPosition: 'top-right',
+    pathToImages: 'img/'
   });
 }]);
\ No newline at end of file
diff --git a/src/app/pages/charts/widgets/funnelChart/funnelChart.js b/src/app/pages/charts/widgets/funnelChart/funnelChart.js
index 9c52245..72ce893 100644
--- a/src/app/pages/charts/widgets/funnelChart/funnelChart.js
+++ b/src/app/pages/charts/widgets/funnelChart/funnelChart.js
@@ -3,54 +3,54 @@
 blurAdminApp.controller('funnelChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var funnelChart = AmCharts.makeChart(id, {
-    type: "funnel",
-    theme: "blur",
+    type: 'funnel',
+    theme: 'blur',
     dataProvider: [
       {
-        title: "Website visits",
+        title: 'Website visits',
         value: 300
       },
       {
-        title: "Downloads",
+        title: 'Downloads',
         value: 123
       },
       {
-        title: "Requested prices",
+        title: 'Requested prices',
         value: 98
       },
       {
-        title: "Contaced",
+        title: 'Contaced',
         value: 72
       },
       {
-        title: "Purchased",
+        title: 'Purchased',
         value: 35
       },
       {
-        title: "Asked for support",
+        title: 'Asked for support',
         value: 25
       },
       {
-        title: "Purchased more",
+        title: 'Purchased more',
         value: 18
       }
     ],
-    titleField: "title",
+    titleField: 'title',
     marginRight: 160,
     marginLeft: 15,
-    labelPosition: "right",
+    labelPosition: 'right',
     funnelAlpha: 0.9,
-    valueField: "value",
+    valueField: 'value',
     startX: 0,
-    neckWidth: "0%",
+    neckWidth: '0%',
     startAlpha: 0,
     outlineThickness: 1,
-    neckHeight: "0%",
-    balloonText: "[[title]]:<b>[[value]]</b>",
+    neckHeight: '0%',
+    balloonText: '[[title]]:<b>[[value]]</b>',
     export: {
       enabled: true
     },
-    creditsPosition: "bottom-left",
-    pathToImages: "release/img/"
+    creditsPosition: 'bottom-left',
+    pathToImages: 'img/'
   });
 }]);
\ No newline at end of file
diff --git a/src/app/pages/charts/widgets/lineChart/lineChart.js b/src/app/pages/charts/widgets/lineChart/lineChart.js
index 34c2701..09a9b22 100644
--- a/src/app/pages/charts/widgets/lineChart/lineChart.js
+++ b/src/app/pages/charts/widgets/lineChart/lineChart.js
@@ -3,123 +3,123 @@
 blurAdminApp.controller('lineChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var lineChart = AmCharts.makeChart(id, {
-    type: "serial",
-    theme: "blur",
+    type: 'serial',
+    theme: 'blur',
     marginTop: 0,
     marginRight: 15,
     dataProvider: [
       {
-        year: "1990",
+        year: '1990',
         value: -0.17
       },
       {
-        year: "1991",
+        year: '1991',
         value: -0.254
       },
       {
-        year: "1992",
+        year: '1992',
         value: 0.019
       },
       {
-        year: "1993",
+        year: '1993',
         value: -0.063
       },
       {
-        year: "1994",
+        year: '1994',
         value: 0.005
       },
       {
-        year: "1995",
+        year: '1995',
         value: 0.077
       },
       {
-        year: "1996",
+        year: '1996',
         value: 0.12
       },
       {
-        year: "1997",
+        year: '1997',
         value: 0.011
       },
       {
-        year: "1998",
+        year: '1998',
         value: 0.177
       },
       {
-        year: "1999",
+        year: '1999',
         value: -0.021
       },
       {
-        year: "2000",
+        year: '2000',
         value: -0.037
       },
       {
-        year: "2001",
+        year: '2001',
         value: 0.03
       },
       {
-        year: "2002",
+        year: '2002',
         value: 0.179
       },
       {
-        year: "2003",
+        year: '2003',
         value: 0.2
       },
       {
-        year: "2004",
+        year: '2004',
         value: 0.180
       },
       {
-        year: "2005",
+        year: '2005',
         value: 0.21
       }
     ],
     valueAxes: [
       {
         axisAlpha: 0,
-        position: "left"
+        position: 'left'
       }
     ],
     graphs: [
       {
-        id: "g1",
-        balloonText: "[[value]]",
-        bullet: "round",
+        id: 'g1',
+        balloonText: '[[value]]',
+        bullet: 'round',
         bulletSize: 8,
         lineColor: colorDanger,
         lineThickness: 1,
         negativeLineColor: colorPrimary,
-        type: "smoothedLine",
-        valueField: "value"
+        type: 'smoothedLine',
+        valueField: 'value'
       }
     ],
     chartScrollbar: {
-      graph: "g1",
+      graph: 'g1',
       gridAlpha: 0,
-      color: "#888888",
+      color: '#888888',
       scrollbarHeight: 55,
       backgroundAlpha: 0,
       selectedBackgroundAlpha: 0.1,
-      selectedBackgroundColor: "#888888",
+      selectedBackgroundColor: '#888888',
       graphFillAlpha: 0,
       autoGridCount: true,
       selectedGraphFillAlpha: 0,
       graphLineAlpha: 0.2,
-      graphLineColor: "#c2c2c2",
-      selectedGraphLineColor: "#888888",
+      graphLineColor: '#c2c2c2',
+      selectedGraphLineColor: '#888888',
       selectedGraphLineAlpha: 1
     },
     chartCursor: {
-      categoryBalloonDateFormat: "YYYY",
+      categoryBalloonDateFormat: 'YYYY',
       cursorAlpha: 0,
       valueLineEnabled: true,
       valueLineBalloonEnabled: true,
       valueLineAlpha: 0.5,
       fullWidth: true
     },
-    dataDateFormat: "YYYY",
-    categoryField: "year",
+    dataDateFormat: 'YYYY',
+    categoryField: 'year',
     categoryAxis: {
-      minPeriod: "YYYY",
+      minPeriod: 'YYYY',
       parseDates: true,
       minorGridAlpha: 0.1,
       minorGridEnabled: true
@@ -127,11 +127,11 @@ blurAdminApp.controller('lineChartCtrl', ['$scope', '$timeout', '$element', func
     export: {
       enabled: true
     },
-    creditsPosition: "bottom-right",
-    pathToImages: "release/img/"
+    creditsPosition: 'bottom-right',
+    pathToImages: 'img/'
   });
 
-  lineChart.addListener("rendered", zoomChart);
+  lineChart.addListener('rendered', zoomChart);
   if (lineChart.zoomChart) {
     lineChart.zoomChart();
   }
diff --git a/src/app/pages/charts/widgets/pieChart/pieChart.js b/src/app/pages/charts/widgets/pieChart/pieChart.js
index 7e94bcf..1b38417 100644
--- a/src/app/pages/charts/widgets/pieChart/pieChart.js
+++ b/src/app/pages/charts/widgets/pieChart/pieChart.js
@@ -3,81 +3,81 @@
 blurAdminApp.controller('pieChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var pieChart = AmCharts.makeChart(id, {
-    type: "pie",
+    type: 'pie',
     startDuration: 0,
-    theme: "blur",
+    theme: 'blur',
     addClassNames: true,
     legend: {
-      position: "right",
+      position: 'right',
       marginRight: 100,
       autoMargins: false
     },
-    innerRadius: "40%",
+    innerRadius: '40%',
     defs: {
       filter: [
         {
-          id: "shadow",
-          width: "200%",
-          height: "200%",
+          id: 'shadow',
+          width: '200%',
+          height: '200%',
           feOffset: {
-            result: "offOut",
-            in: "SourceAlpha",
+            result: 'offOut',
+            in: 'SourceAlpha',
             dx: 0,
             dy: 0
           },
           feGaussianBlur: {
-            result: "blurOut",
-            in: "offOut",
+            result: 'blurOut',
+            in: 'offOut',
             stdDeviation: 5
           },
           feBlend: {
-            in: "SourceGraphic",
-            in2: "blurOut",
-            mode: "normal"
+            in: 'SourceGraphic',
+            in2: 'blurOut',
+            mode: 'normal'
           }
         }
       ]
     },
     dataProvider: [
       {
-        country: "Lithuania",
+        country: 'Lithuania',
         litres: 501.9
       },
       {
-        country: "Czech Republic",
+        country: 'Czech Republic',
         litres: 301.9
       },
       {
-        country: "Ireland",
+        country: 'Ireland',
         litres: 201.1
       },
       {
-        country: "Germany",
+        country: 'Germany',
         litres: 165.8
       },
       {
-        country: "Australia",
+        country: 'Australia',
         litres: 139.9
       },
       {
-        country: "Austria",
+        country: 'Austria',
         litres: 128.3
       },
       {
-        country: "UK",
+        country: 'UK',
         litres: 99
       },
       {
-        country: "Belgium",
+        country: 'Belgium',
         litres: 60
       }
     ],
-    valueField: "litres",
-    titleField: "country",
+    valueField: 'litres',
+    titleField: 'country',
     export: {
       enabled: true
     },
-    creditsPosition: "bottom-left",
+    creditsPosition: 'bottom-left',
 
     autoMargins: false,
     marginTop: 10,
@@ -85,17 +85,17 @@ blurAdminApp.controller('pieChartCtrl', ['$scope', '$timeout', '$element', funct
     marginLeft: 0,
     marginRight: 0,
     pullOutRadius: 0,
-    pathToImages: "release/img/"
+    pathToImages: 'img/'
   });
 
-  pieChart.addListener("init", handleInit);
+  pieChart.addListener('init', handleInit);
 
-  pieChart.addListener("rollOverSlice", function (e) {
+  pieChart.addListener('rollOverSlice', function (e) {
     handleRollOver(e);
   });
 
   function handleInit() {
-    pieChart.legend.addListener("rollOverItem", handleRollOver);
+    pieChart.legend.addListener('rollOverItem', handleRollOver);
   }
 
   function handleRollOver(e) {
diff --git a/src/app/pages/dashboard/dashboard.js b/src/app/pages/dashboard/dashboard.js
index f5029bf..ab42fc3 100644
--- a/src/app/pages/dashboard/dashboard.js
+++ b/src/app/pages/dashboard/dashboard.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.dashboard', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/dashboard', {
-        templateUrl: '/app/pages/dashboard/dashboard.html',
+        templateUrl: 'app/pages/dashboard/dashboard.html',
         controller: 'DashboardCtrl'
       });
     }])
@@ -15,30 +15,30 @@ angular.module('BlurAdmin.dashboard', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Users by Country",
-                url: "/app/pages/dashboard/widgets/amChartMap/amChartMap.html"
+                title: 'Users by Country',
+                url: 'app/pages/dashboard/widgets/amChartMap/amChartMap.html'
               },
               {
-                title: "Revenue",
-                url: "/app/pages/dashboard/widgets/amChart/amChart.html"
+                title: 'Revenue',
+                url: 'app/pages/dashboard/widgets/amChart/amChart.html'
               },
               {
-                title: "My Calendar",
-                url: "/app/pages/dashboard/widgets/calendar/calendar.html"
+                title: 'My Calendar',
+                url: 'app/pages/dashboard/widgets/calendar/calendar.html'
               }
             ],
             [
               {
-                title: "Acquisition Channels",
-                url: "/app/pages/dashboard/widgets/chart/chart.html"
+                title: 'Acquisition Channels',
+                url: 'app/pages/dashboard/widgets/chart/chart.html'
               },
               {
-                title: "Timeline",
-                url: "/app/pages/dashboard/widgets/timeline/timeline.html"
+                title: 'Timeline',
+                url: 'app/pages/dashboard/widgets/timeline/timeline.html'
               },
               {
-                title: "ToDo List",
-                url: "/app/pages/dashboard/widgets/todo/todo.html"
+                title: 'ToDo List',
+                url: 'app/pages/dashboard/widgets/todo/todo.html'
               }
             ]
           ]
diff --git a/src/app/pages/dashboard/widgets/amChart/amChart.js b/src/app/pages/dashboard/widgets/amChart/amChart.js
index 0f784a0..7569b72 100644
--- a/src/app/pages/dashboard/widgets/amChart/amChart.js
+++ b/src/app/pages/dashboard/widgets/amChart/amChart.js
@@ -62,8 +62,8 @@ blurAdminApp.controller('amChartCtrl', ['$scope', '$timeout', '$element', functi
 
   var id = $element[0].getAttribute('id');
   var chart = AmCharts.makeChart(id, {
-    type: "serial",
-    theme: "blur",
+    type: 'serial',
+    theme: 'blur',
     marginTop: 0,
     marginRight: 15,
     dataProvider: chartData,
@@ -74,46 +74,46 @@ blurAdminApp.controller('amChartCtrl', ['$scope', '$timeout', '$element', functi
     ],
     graphs: [
       {
-        id: "g1",
-        bullet: "round",
+        id: 'g1',
+        bullet: 'round',
         bulletSize: 8,
         useLineColorForBulletBorder: true,
         lineColor: colorSuccess,
         lineThickness: 1,
         negativeLineColor: colorDanger,
-        type: "smoothedLine",
-        valueField: "value",
+        type: 'smoothedLine',
+        valueField: 'value',
         fillAlphas: 0.3,
-        fillColorsField: "lineColor"
+        fillColorsField: 'lineColor'
       }
     ],
     chartScrollbar: {
-      graph: "g1",
+      graph: 'g1',
       gridAlpha: 0,
-      color: "#888888",
+      color: '#888888',
       scrollbarHeight: 55,
       backgroundAlpha: 0,
       selectedBackgroundAlpha: 0.1,
-      selectedBackgroundColor: "#ffffff",
+      selectedBackgroundColor: '#ffffff',
       graphFillAlpha: 0,
       autoGridCount: true,
       selectedGraphFillAlpha: 0,
       graphLineAlpha: 0.2,
-      graphLineColor: "#c2c2c2",
-      selectedGraphLineColor: "#888888",
+      graphLineColor: '#c2c2c2',
+      selectedGraphLineColor: '#888888',
       selectedGraphLineAlpha: 1
     },
     chartCursor: {
-      categoryBalloonDateFormat: "MM YYYY",
-      categoryBalloonColor: "#4285F4",
+      categoryBalloonDateFormat: 'MM YYYY',
+      categoryBalloonColor: '#4285F4',
       categoryBalloonAlpha: 0.7,
       cursorAlpha: 0,
       valueLineEnabled: true,
       valueLineBalloonEnabled: true,
       valueLineAlpha: 0.5
     },
-    dataDateFormat: "MM YYYY",
-    categoryField: "date",
+    dataDateFormat: 'MM YYYY',
+    categoryField: 'date',
     categoryAxis: {
       parseDates: true,
       gridAlpha: 0
@@ -121,20 +121,20 @@ blurAdminApp.controller('amChartCtrl', ['$scope', '$timeout', '$element', functi
     export: {
       enabled: true
     },
-    creditsPosition: "bottom-right",
+    creditsPosition: 'bottom-right',
     zoomOutButton: {
       backgroundColor: '#fff',
       backgroundAlpha: 0
     },
-    zoomOutText: "",
-    pathToImages: "release/img/"
+    zoomOutText: '',
+    pathToImages: 'img/'
   });
 
   function zoomChart() {
     chart.zoomToDates(new Date(2013, 3), new Date(2013, 10));
   }
 
-  chart.addListener("rendered", zoomChart);
+  chart.addListener('rendered', zoomChart);
   zoomChart();
   if (chart.zoomChart) {
     chart.zoomChart();
diff --git a/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js b/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js
index ce45037..096698a 100644
--- a/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js
+++ b/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js
@@ -4,252 +4,252 @@ blurAdminApp.controller('amMapCtrl', ['$scope', '$timeout', '$element', function
   var id = $element[0].getAttribute('id');
   var map = AmCharts.makeChart(id, {
 
-    type: "map",
-    "theme": "blur",
+    type: 'map',
+    theme: 'blur',
 
     dataProvider: {
-      map: "worldLow",
+      map: 'worldLow',
       zoomLevel: 3.5,
       zoomLongitude: 10,
       zoomLatitude: 52,
       areas: [
         {
-          title: "Austria",
-          id: "AT",
+          title: 'Austria',
+          id: 'AT',
           color: colorPrimary,
-          customData: "1 244",
-          groupId: "1"
+          customData: '1 244',
+          groupId: '1'
         },
         {
-          title: "Ireland",
-          id: "IE",
+          title: 'Ireland',
+          id: 'IE',
           color: colorPrimary,
-          customData: "1 342",
-          groupId: "1"
+          customData: '1 342',
+          groupId: '1'
         },
         {
-          title: "Denmark",
-          id: "DK",
+          title: 'Denmark',
+          id: 'DK',
           color: colorPrimary,
-          customData: "1 973",
-          groupId: "1"
+          customData: '1 973',
+          groupId: '1'
         },
         {
-          title: "Finland",
-          id: "FI",
+          title: 'Finland',
+          id: 'FI',
           color: colorPrimary,
-          customData: "1 573",
-          groupId: "1"
+          customData: '1 573',
+          groupId: '1'
         },
         {
-          title: "Sweden",
-          id: "SE",
+          title: 'Sweden',
+          id: 'SE',
           color: colorPrimary,
-          customData: "1 084",
-          groupId: "1"
+          customData: '1 084',
+          groupId: '1'
         },
         {
-          title: "Great Britain",
-          id: "GB",
+          title: 'Great Britain',
+          id: 'GB',
           color: colorPrimary,
-          customData: "1 452",
-          groupId: "1"
+          customData: '1 452',
+          groupId: '1'
         },
         {
-          title: "Italy",
-          id: "IT",
+          title: 'Italy',
+          id: 'IT',
           color: colorPrimary,
-          customData: "1 321",
-          groupId: "1"
+          customData: '1 321',
+          groupId: '1'
         },
         {
-          title: "France",
-          id: "FR",
+          title: 'France',
+          id: 'FR',
           color: colorPrimary,
-          customData: "1 112",
-          groupId: "1"
+          customData: '1 112',
+          groupId: '1'
         },
         {
-          title: "Spain",
-          id: "ES",
+          title: 'Spain',
+          id: 'ES',
           color: colorPrimary,
-          customData: "1 865",
-          groupId: "1"
+          customData: '1 865',
+          groupId: '1'
         },
         {
-          title: "Greece",
-          id: "GR",
+          title: 'Greece',
+          id: 'GR',
           color: colorPrimary,
-          customData: "1 453",
-          groupId: "1"
+          customData: '1 453',
+          groupId: '1'
         },
         {
-          title: "Germany",
-          id: "DE",
+          title: 'Germany',
+          id: 'DE',
           color: colorPrimary,
-          customData: "1 957",
-          groupId: "1"
+          customData: '1 957',
+          groupId: '1'
         },
         {
-          title: "Belgium",
-          id: "BE",
+          title: 'Belgium',
+          id: 'BE',
           color: colorPrimary,
-          customData: "1 011",
-          groupId: "1"
+          customData: '1 011',
+          groupId: '1'
         },
         {
-          title: "Luxembourg",
-          id: "LU",
+          title: 'Luxembourg',
+          id: 'LU',
           color: colorPrimary,
-          customData: "1 011",
-          groupId: "1"
+          customData: '1 011',
+          groupId: '1'
         },
         {
-          title: "Netherlands",
-          id: "NL",
+          title: 'Netherlands',
+          id: 'NL',
           color: colorPrimary,
-          customData: "1 213",
-          groupId: "1"
+          customData: '1 213',
+          groupId: '1'
         },
         {
-          title: "Portugal",
-          id: "PT",
+          title: 'Portugal',
+          id: 'PT',
           color: colorPrimary,
-          customData: "1 291",
-          groupId: "1"
+          customData: '1 291',
+          groupId: '1'
         },
 
         {
-          title: "Lithuania",
-          id: "LT",
+          title: 'Lithuania',
+          id: 'LT',
           color: colorSuccessLight,
-          customData: "567",
-          groupId: "2"
+          customData: '567',
+          groupId: '2'
         },
         {
-          title: "Latvia",
-          id: "LV",
+          title: 'Latvia',
+          id: 'LV',
           color: colorSuccessLight,
-          customData: "589",
-          groupId: "2"
+          customData: '589',
+          groupId: '2'
         },
         {
-          title: "Czech Republic ",
-          id: "CZ",
+          title: 'Czech Republic ',
+          id: 'CZ',
           color: colorSuccessLight,
-          customData: "785",
-          groupId: "2"
+          customData: '785',
+          groupId: '2'
         },
         {
-          title: "Slovakia",
-          id: "SK",
+          title: 'Slovakia',
+          id: 'SK',
           color: colorSuccessLight,
-          customData: "965",
-          groupId: "2"
+          customData: '965',
+          groupId: '2'
         },
         {
-          title: "Estonia",
-          id: "EE",
+          title: 'Estonia',
+          id: 'EE',
           color: colorSuccessLight,
-          customData: "685",
-          groupId: "2"
+          customData: '685',
+          groupId: '2'
         },
         {
-          title: "Hungary",
-          id: "HU",
+          title: 'Hungary',
+          id: 'HU',
           color: colorSuccessLight,
-          customData: "854",
-          groupId: "2"
+          customData: '854',
+          groupId: '2'
         },
         {
-          title: "Cyprus",
-          id: "CY",
+          title: 'Cyprus',
+          id: 'CY',
           color: colorSuccessLight,
-          customData: "754",
-          groupId: "2"
+          customData: '754',
+          groupId: '2'
         },
         {
-          title: "Malta",
-          id: "MT",
+          title: 'Malta',
+          id: 'MT',
           color: colorSuccessLight,
-          customData: "867",
-          groupId: "2"
+          customData: '867',
+          groupId: '2'
         },
         {
-          title: "Poland",
-          id: "PL",
+          title: 'Poland',
+          id: 'PL',
           color: colorSuccessLight,
-          customData: "759",
-          groupId: "2"
+          customData: '759',
+          groupId: '2'
         },
 
         {
-          title: "Romania",
-          id: "RO",
+          title: 'Romania',
+          id: 'RO',
           color: colorSuccess,
-          customData: "302",
-          groupId: "3"
+          customData: '302',
+          groupId: '3'
         },
         {
-          title: "Bulgaria",
-          id: "BG",
+          title: 'Bulgaria',
+          id: 'BG',
           color: colorSuccess,
-          customData: "102",
-          groupId: "3"
+          customData: '102',
+          groupId: '3'
         },
         {
-          title: "Slovenia",
-          id: "SI",
+          title: 'Slovenia',
+          id: 'SI',
           color: colorDanger,
-          customData: "23",
-          groupId: "4"
+          customData: '23',
+          groupId: '4'
         },
         {
-          title: "Croatia",
-          id: "HR",
+          title: 'Croatia',
+          id: 'HR',
           color: colorDanger,
-          customData: "96",
-          groupId: "4"
+          customData: '96',
+          groupId: '4'
         }
       ]
     },
 
     areasSettings: {
-      rollOverOutlineColor: "#FFFFFF",
+      rollOverOutlineColor: '#FFFFFF',
       rollOverColor: colorPrimaryDark,
       alpha: 0.8,
       unlistedAreasAlpha: 0.1,
-      balloonText: "[[title]]: [[customData]] users"
+      balloonText: '[[title]]: [[customData]] users'
     },
 
 
     legend: {
-      width: "100%",
+      width: '100%',
       marginRight: 27,
       marginLeft: 27,
       equalWidths: false,
       backgroundAlpha: 0.5,
-      backgroundColor: "#FFFFFF",
-      borderColor: "#ffffff",
+      backgroundColor: '#FFFFFF',
+      borderColor: '#ffffff',
       borderAlpha: 1,
       top: 362,
       left: 0,
       horizontalGap: 10,
       data: [
         {
-          title: "over 1 000 users",
+          title: 'over 1 000 users',
           color: colorPrimary
         },
         {
-          title: "500 - 1 000 users",
+          title: '500 - 1 000 users',
           color: colorSuccessLight
         },
         {
-          title: "100 - 500 users",
+          title: '100 - 500 users',
           color: colorSuccess
         },
         {
-          title: "0 - 100 users",
+          title: '0 - 100 users',
           color: colorDanger
         }
       ]
@@ -257,7 +257,7 @@ blurAdminApp.controller('amMapCtrl', ['$scope', '$timeout', '$element', function
     export: {
       enabled: true
     },
-    creditsPosition: "bottom-right",
-    pathToImages: "release/img/"
+    creditsPosition: 'bottom-right',
+    pathToImages: 'img/'
   });
 }]);
\ No newline at end of file
diff --git a/src/app/pages/dashboard/widgets/chart/chart.js b/src/app/pages/dashboard/widgets/chart/chart.js
index 3367d58..a805b96 100644
--- a/src/app/pages/dashboard/widgets/chart/chart.js
+++ b/src/app/pages/dashboard/widgets/chart/chart.js
@@ -7,44 +7,44 @@ blurAdminApp.controller('trafficChartCtrl', [function () {
       value: 2000,
       color: colorPrimary,
       highlight: colorPrimaryDark,
-      label: "Ad Campaigns"
+      label: 'Ad Campaigns'
     },
     {
       value: 1500,
       color: colorDanger,
       highlight: colorDangerDark,
-      label: "Search engines"
+      label: 'Search engines'
     },
     {
       value: 1000,
       color: colorSuccessLight,
       highlight: '#6c9c3f',
-      label: "Direct Traffic"
+      label: 'Direct Traffic'
     },
     {
       value: 1200,
       color: colorSuccess,
       highlight: colorSuccessDark,
-      label: "Referral Traffic"
+      label: 'Referral Traffic'
     },
     {
       value: 400,
       color: colorWarning,
       highlight: colorWarningDark,
-      label: "Other"
+      label: 'Other'
     }
   ];
 
-  var ctx = document.getElementById("chart-area").getContext("2d");
+  var ctx = document.getElementById('chart-area').getContext('2d');
   window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, {
     responsive: true,
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend clearfix\">" +
-        "<% for (var i=0; i<segments.length; i++){%>" +
-        "<li class=\"clearfix\">" +
-        "<span style=\"background-color:<%=segments[i].fillColor%>\"></span>" +
-        "<%if(segments[i].label){%><%=segments[i].label%><%}%>" +
-        "</li><%}%>" +
-        "</ul>"
+    legendTemplate: '<ul class="<%=name.toLowerCase()%>-legend clearfix">' +
+        '<% for (var i=0; i<segments.length; i++){%>' +
+        '<li class="clearfix">' +
+        '<span style="background-color:<%=segments[i].fillColor%>"></span>' +
+        '<%if(segments[i].label){%><%=segments[i].label%><%}%>' +
+        '</li><%}%>' +
+        '</ul>'
   });
 
   var legend = window.myDoughnut.generateLegend();
diff --git a/src/app/pages/dashboard/widgets/timeline/timeline.html b/src/app/pages/dashboard/widgets/timeline/timeline.html
index 841dd02..b45c2a7 100644
--- a/src/app/pages/dashboard/widgets/timeline/timeline.html
+++ b/src/app/pages/dashboard/widgets/timeline/timeline.html
@@ -1,7 +1,7 @@
 <section id="cd-timeline" class="cd-container cssanimations" ng-controller="timelineCtrl">
   <div class="cd-timeline-block">
     <div class="cd-timeline-img cd-picture">
-      <img src="release/img/cd-icon-picture.svg" alt="Picture">
+      <img src="img/cd-icon-picture.svg" alt="Picture">
     </div>
 
     <div class="cd-timeline-content cd-timeline-content-green">
@@ -15,7 +15,7 @@
 
   <div class="cd-timeline-block">
     <div class="cd-timeline-img cd-movie">
-      <img src="release/img/cd-icon-movie.svg" alt="Movie">
+      <img src="img/cd-icon-movie.svg" alt="Movie">
     </div>
 
     <div class="cd-timeline-content cd-timeline-content-red">
@@ -29,7 +29,7 @@
 
   <div class="cd-timeline-block">
     <div class="cd-timeline-img cd-location">
-      <img src="release/img/cd-icon-location.svg" alt="Location">
+      <img src="img/cd-icon-location.svg" alt="Location">
     </div>
 
     <div class="cd-timeline-content cd-timeline-content-blue">
diff --git a/src/app/pages/dashboard/widgets/todo/todo.js b/src/app/pages/dashboard/widgets/todo/todo.js
index 8840d59..be31047 100644
--- a/src/app/pages/dashboard/widgets/todo/todo.js
+++ b/src/app/pages/dashboard/widgets/todo/todo.js
@@ -3,7 +3,7 @@
 blurAdminApp.directive('blurTodo', function () {
   return {
     restrict: 'A',
-    controller: ["$scope", function ($scope) {
+    controller: ['$scope', function ($scope) {
 
       $scope.marks = [
         {
@@ -30,37 +30,37 @@ blurAdminApp.directive('blurTodo', function () {
 
       $scope.todoList = [
         {
-          text: "Check me out",
+          text: 'Check me out',
           edit: false, // todo: remove edit
           markId: 4
         },
         {
-          text: "Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro",
+          text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro',
           edit: false,
           markId: 3
         },
         {
-          text: "Ex has semper alterum, expetenda dignissim",
+          text: 'Ex has semper alterum, expetenda dignissim',
           edit: false,
           markId: 2
         },
         {
-          text: "Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.",
+          text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.',
           edit: false,
           markId: 1
         },
         {
-          text: "Simul erroribus ad usu",
+          text: 'Simul erroribus ad usu',
           edit: false,
           markId: 0
         },
         {
-          text: "Ei cum solet appareat, ex est graeci mediocritatem",
+          text: 'Ei cum solet appareat, ex est graeci mediocritatem',
           edit: false,
           markId: 4
         },
         {
-          text: "Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro. Eirmod prompta usu ex, meliore oporteat est ad.",
+          text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro. Eirmod prompta usu ex, meliore oporteat est ad.',
           edit: false,
           markId: 3
         }
@@ -88,7 +88,7 @@ blurAdminApp.directive('blurTodo', function () {
         }
       };
 
-      $scope.newTodoText = "";
+      $scope.newTodoText = '';
 
       $scope.addToDoItem = function (event) {
         if (event.which === 13) {
@@ -97,7 +97,7 @@ blurAdminApp.directive('blurTodo', function () {
             edit: false,
             markId: 0
           });
-          $scope.newTodoText = "";
+          $scope.newTodoText = '';
         }
       };
     }],
diff --git a/src/app/pages/form/inputs/inputs.js b/src/app/pages/form/inputs/inputs.js
index 511ab85..d620bbf 100644
--- a/src/app/pages/form/inputs/inputs.js
+++ b/src/app/pages/form/inputs/inputs.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.formInputsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/form-inputs', {
-        templateUrl: '/app/pages/form/inputs/inputs.html',
+        templateUrl: 'app/pages/form/inputs/inputs.html',
         controller: 'formInputsPageCtrl'
       });
     }])
@@ -14,34 +14,34 @@ angular.module('BlurAdmin.formInputsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Standard Fields",
-                url: "/app/pages/form/inputs/widgets/standardFields.html"
+                title: 'Standard Fields',
+                url: 'app/pages/form/inputs/widgets/standardFields.html'
               },
               {
-                title: "Tags Input",
-                url: "/app/pages/form/inputs/widgets/tagsInput/tagsInput.html"
+                title: 'Tags Input',
+                url: 'app/pages/form/inputs/widgets/tagsInput/tagsInput.html'
               },
               {
-                title: "Input Groups",
-                url: "/app/pages/form/inputs/widgets/inputGroups.html"
+                title: 'Input Groups',
+                url: 'app/pages/form/inputs/widgets/inputGroups.html'
               },
               {
-                title: "Checkboxes & Radios",
-                url: "/app/pages/form/inputs/widgets/checkboxesRadios.html"
+                title: 'Checkboxes & Radios',
+                url: 'app/pages/form/inputs/widgets/checkboxesRadios.html'
               }
             ],
             [
               {
-                title: "Validation States",
-                url: "/app/pages/form/inputs/widgets/validationStates.html"
+                title: 'Validation States',
+                url: 'app/pages/form/inputs/widgets/validationStates.html'
               },
               {
-                title: "Selects",
-                url: "/app/pages/form/inputs/widgets/select/select.html"
+                title: 'Selects',
+                url: 'app/pages/form/inputs/widgets/select/select.html'
               },
               {
-                title: "On/Off Switches",
-                url: "/app/pages/form/inputs/widgets/switch/switch.html"
+                title: 'On/Off Switches',
+                url: 'app/pages/form/inputs/widgets/switch/switch.html'
               }
             ]
           ]
diff --git a/src/app/pages/form/inputs/widgets/switch/switch.js b/src/app/pages/form/inputs/widgets/switch/switch.js
index 56db0e6..9abac6b 100644
--- a/src/app/pages/form/inputs/widgets/switch/switch.js
+++ b/src/app/pages/form/inputs/widgets/switch/switch.js
@@ -5,14 +5,14 @@ blurAdminApp.directive('switch', ['$timeout', function ($timeout) {
     restrict: 'EA',
     replace: true,
     scope: {
-      ngModel: "="
+      ngModel: '='
     },
     template: '<div class="switch-container {{color}}"><input type="checkbox" ng-model="ngModel"></div>',
     link: function (scope, elem, attr) {
       $timeout(function(){
         scope.color = attr.color;
         $(elem).find('input').bootstrapSwitch({
-          size: "small",
+          size: 'small',
           onColor: attr.color
         });
       });
diff --git a/src/app/pages/form/layouts/layouts.js b/src/app/pages/form/layouts/layouts.js
index 04895da..53349df 100644
--- a/src/app/pages/form/layouts/layouts.js
+++ b/src/app/pages/form/layouts/layouts.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.formLayoutsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/form-layouts', {
-        templateUrl: '/app/pages/form/layouts/layouts.html',
+        templateUrl: 'app/pages/form/layouts/layouts.html',
         controller: 'formLayoutsPageCtrl'
       });
     }])
@@ -15,7 +15,7 @@ angular.module('BlurAdmin.formLayoutsPage', ['ngRoute'])
             [
               {
                 title: 'Inline Form',
-                url: "/app/pages/form/layouts/widgets/inlineForm.html"
+                url: 'app/pages/form/layouts/widgets/inlineForm.html'
               }
             ]
           ]
@@ -24,22 +24,22 @@ angular.module('BlurAdmin.formLayoutsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Basic Form",
-                url: "/app/pages/form/layouts/widgets/basicForm.html"
+                title: 'Basic Form',
+                url: 'app/pages/form/layouts/widgets/basicForm.html'
               },
               {
-                title: "Block Form",
-                url: "/app/pages/form/layouts/widgets/blockForm.html"
+                title: 'Block Form',
+                url: 'app/pages/form/layouts/widgets/blockForm.html'
               }
             ],
             [
               {
-                title: "Horizontal Form",
-                url: "/app/pages/form/layouts/widgets/horizontalForm.html"
+                title: 'Horizontal Form',
+                url: 'app/pages/form/layouts/widgets/horizontalForm.html'
               },
               {
-                title: "Form Without Labels",
-                url: "/app/pages/form/layouts/widgets/formWithoutLabels.html"
+                title: 'Form Without Labels',
+                url: 'app/pages/form/layouts/widgets/formWithoutLabels.html'
               }
             ]
           ]
diff --git a/src/app/pages/icons/icons.js b/src/app/pages/icons/icons.js
index 5cb7bcd..f8d0bbd 100644
--- a/src/app/pages/icons/icons.js
+++ b/src/app/pages/icons/icons.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.iconsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/icons', {
-        templateUrl: '/app/pages/icons/icons.html',
+        templateUrl: 'app/pages/icons/icons.html',
         controller: 'iconsPageCtrl'
       });
     }])
@@ -14,26 +14,26 @@ angular.module('BlurAdmin.iconsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Kameleon SVG Icons",
-                url: "/app/pages/icons/widgets/kameleon.html"
+                title: 'Kameleon SVG Icons',
+                url: 'app/pages/icons/widgets/kameleon.html'
               },
               {
-                title: "Socicon",
-                url: "/app/pages/icons/widgets/socicon.html"
+                title: 'Socicon',
+                url: 'app/pages/icons/widgets/socicon.html'
               }
             ],
             [
               {
-                title: "Icons With Rounded Background",
-                url: "/app/pages/icons/widgets/kameleonRounded.html"
+                title: 'Icons With Rounded Background',
+                url: 'app/pages/icons/widgets/kameleonRounded.html'
               },
               {
-                title: "ionicons",
-                url: "/app/pages/icons/widgets/ionicons.html"
+                title: 'ionicons',
+                url: 'app/pages/icons/widgets/ionicons.html'
               },
               {
-                title: "Font Awesome Icons",
-                url: "/app/pages/icons/widgets/fontAwesomeIcons.html"
+                title: 'Font Awesome Icons',
+                url: 'app/pages/icons/widgets/fontAwesomeIcons.html'
               }
             ]
           ]
@@ -43,206 +43,205 @@ angular.module('BlurAdmin.iconsPage', ['ngRoute'])
       $scope.icons = {
         kameleonIcons: [
           {
-            name: "Beach",
-            img: "Beach.svg"
+            name: 'Beach',
+            img: 'Beach.svg'
           },
           {
-            name: "Bus",
-            img: "Bus.svg"
+            name: 'Bus',
+            img: 'Bus.svg'
           },
           {
-            name: "Cheese",
-            img: "Cheese.svg"
+            name: 'Cheese',
+            img: 'Cheese.svg'
           },
           {
-            name: "Desert",
-            img: "Desert.svg"
+            name: 'Desert',
+            img: 'Desert.svg'
           },
           {
-            name: "Images",
-            img: "Images.svg"
+            name: 'Images',
+            img: 'Images.svg'
           },
           {
-            name: "Magician",
-            img: "Magician.svg"
+            name: 'Magician',
+            img: 'Magician.svg'
           },
           {
-            name: "Makeup",
-            img: "Makeup.svg"
+            name: 'Makeup',
+            img: 'Makeup.svg'
           },
           {
-            name: "Programming",
-            img: "Programming.svg"
+            name: 'Programming',
+            img: 'Programming.svg'
           },
           {
-            name: "Shop",
-            img: "Shop.svg"
+            name: 'Shop',
+            img: 'Shop.svg'
           },
           {
-            name: "Surfer",
-            img: "Surfer.svg"
+            name: 'Surfer',
+            img: 'Surfer.svg'
           },
           {
-            name: "Phone Booth",
-            img: "Phone-Booth.svg"
+            name: 'Phone Booth',
+            img: 'Phone-Booth.svg'
           },
           {
-            name: "Ninja",
-            img: "Ninja.svg"
+            name: 'Ninja',
+            img: 'Ninja.svg'
           },
           {
-            name: "Apartment",
-            img: "Apartment.svg"
+            name: 'Apartment',
+            img: 'Apartment.svg'
           },
           {
-            name: "Batman",
-            img: "Batman.svg"
+            name: 'Batman',
+            img: 'Batman.svg'
           },
           {
-            name: "Medal",
-            img: "Medal-2.svg"
+            name: 'Medal',
+            img: 'Medal-2.svg'
           },
           {
-            name: "Money",
-            img: "Money-Increase.svg"
+            name: 'Money',
+            img: 'Money-Increase.svg'
           },
           {
-            name: "Street View",
-            img: "Street-View.svg"
+            name: 'Street View',
+            img: 'Street-View.svg'
           },
           {
-            name: "Student",
-            img: "Student-3.svg"
+            name: 'Student',
+            img: 'Student-3.svg'
           },
           {
-            name: "Bell",
-            img: "Bell.svg"
+            name: 'Bell',
+            img: 'Bell.svg'
           },
           {
-            name: "Woman",
-            img: "Boss-5.svg"
+            name: 'Woman',
+            img: 'Boss-5.svg'
           },
           {
-            name: "Euro",
-            img: "Euro-Coin.svg"
+            name: 'Euro',
+            img: 'Euro-Coin.svg'
           },
           {
-            name: "Chessboard",
-            img: "Chessboard.svg"
+            name: 'Chessboard',
+            img: 'Chessboard.svg'
           },
           {
-            name: "Burglar",
-            img: "Burglar.svg"
+            name: 'Burglar',
+            img: 'Burglar.svg'
           },
           {
-            name: "Dna",
-            img: "Dna.svg"
+            name: 'Dna',
+            img: 'Dna.svg'
           },
           {
-            name: "Clipboard Plan",
-            img: "Clipboard-Plan.svg"
+            name: 'Clipboard Plan',
+            img: 'Clipboard-Plan.svg'
           },
           {
-            name: "Boss",
-            img: "Boss-3.svg"
+            name: 'Boss',
+            img: 'Boss-3.svg'
           },
           {
-            name: "Key",
-            img: "Key.svg"
+            name: 'Key',
+            img: 'Key.svg'
           },
           {
-            name: "Surgeon",
-            img: "Surgeon.svg"
+            name: 'Surgeon',
+            img: 'Surgeon.svg'
           },
           {
-            name: "Hacker",
-            img: "Hacker.svg"
+            name: 'Hacker',
+            img: 'Hacker.svg'
           },
           {
-            name: "Santa",
-            img: "Santa.svg"
+            name: 'Santa',
+            img: 'Santa.svg'
           }
         ],
         kameleonRoundedIcons: [
           {
-            color: "success",
-            img: "Apartment.svg",
-            name: "Apartment"
+            color: 'success',
+            img: 'Apartment.svg',
+            name: 'Apartment'
           },
           {
-            color: "warning",
-            img: "Bus.svg",
-            name: "Bus"
+            color: 'warning',
+            img: 'Bus.svg',
+            name: 'Bus'
           },
           {
-            color: "primary",
-            img: "Checklist.svg",
-            name: "Checklist"
+            color: 'primary',
+            img: 'Checklist.svg',
+            name: 'Checklist'
           },
           {
-            color: "warning",
-            img: "Desert.svg",
-            name: "Desert"
+            color: 'warning',
+            img: 'Desert.svg',
+            name: 'Desert'
           },
           {
-            color: "danger",
-            img: "Laptop-Signal.svg",
-            name: "Laptop Signal"
+            color: 'danger',
+            img: 'Laptop-Signal.svg',
+            name: 'Laptop Signal'
           },
           {
-            color: "info",
-            img: "Love-Letter.svg",
-            name: "Love Letter"
+            color: 'info',
+            img: 'Love-Letter.svg',
+            name: 'Love Letter'
           },
           {
-            color: "success",
-            img: "Makeup.svg",
-            name: "Makeup"
+            color: 'success',
+            img: 'Makeup.svg',
+            name: 'Makeup'
           },
           {
-            color: "primary",
-            img: "Santa.svg",
-            name: "Santa"
+            color: 'primary',
+            img: 'Santa.svg',
+            name: 'Santa'
           },
           {
-            color: "success",
-            img: "Surfer.svg",
-            name: "Surfer"
+            color: 'success',
+            img: 'Surfer.svg',
+            name: 'Surfer'
           },
           {
-            color: "info",
-            img: "Vector.svg",
-            name: "Vector"
+            color: 'info',
+            img: 'Vector.svg',
+            name: 'Vector'
           },
           {
-            color: "warning",
-            img: "Money-Increase.svg",
-            name: "Money Increase"
+            color: 'warning',
+            img: 'Money-Increase.svg',
+            name: 'Money Increase'
           },
           {
-            color: "info",
-            img: "Alien.svg",
-            name: "Alien"
+            color: 'info',
+            img: 'Alien.svg',
+            name: 'Alien'
           },
           {
-            color: "danger",
-            img: "Online-Shopping.svg",
-            name: "Online Shopping"
+            color: 'danger',
+            img: 'Online-Shopping.svg',
+            name: 'Online Shopping'
           },
           {
-            color: "warning",
-            img: "Euro-Coin.svg",
-            name: "Euro"
+            color: 'warning',
+            img: 'Euro-Coin.svg',
+            name: 'Euro'
           },
           {
-            color: "info",
-            img: "Boss-3.svg",
-            name: "Boss"
+            color: 'info',
+            img: 'Boss-3.svg',
+            name: 'Boss'
           }
         ],
-        ionicons: ["ion-ionic", "ion-arrow-right-b", "ion-arrow-down-b", "ion-arrow-left-b", "ion-arrow-up-c", "ion-arrow-right-c", "ion-arrow-down-c", "ion-arrow-left-c", "ion-arrow-return-right", "ion-arrow-return-left", "ion-arrow-swap", "ion-arrow-shrink", "ion-arrow-expand", "ion-arrow-move", "ion-arrow-resize", "ion-chevron-up", "ion-chevron-right", "ion-chevron-down", "ion-chevron-left", "ion-navicon-round", "ion-navicon", "ion-drag", "ion-log-in", "ion-log-out", "ion-checkmark-round", "ion-checkmark", "ion-checkmark-circled", "ion-close-round", "ion-plus-round", "ion-minus-round", "ion-information", "ion-help", "ion-backspace-outline", "ion-help-buoy", "ion-asterisk", "ion-alert", "ion-alert-circled", "ion-refresh", "ion-loop", "ion-shuffle", "ion-home", "ion-search", "ion-flag", "ion-star", "ion-heart", "ion-heart-broken", "ion-gear-a", "ion-gear-b", "ion-toggle-filled", "ion-toggle", "ion-settings", "ion-wrench", "ion-hammer", "ion-edit", "ion-trash-a", "ion-trash-b", "ion-document", "ion-document-text", "ion-clipboard", "ion-scissors", "ion-funnel", "ion-bookmark", "ion-email", "ion-email-unread", "ion-folder", "ion-filing", "ion-archive", "ion-reply", "ion-reply-all", "ion-forward"],
-        fontAwesomeIcons: ["fa fa-adjust", "fa fa-anchor", "fa fa-archive", "fa fa-area-chart", "fa fa-arrows", "fa fa-arrows-h", "fa fa-arrows-v", "fa fa-asterisk", "fa fa-at", "fa fa-automobile", "fa fa-ban", "fa fa-bank", "fa fa-bar-chart", "fa fa-bar-chart-o", "fa fa-barcode", "fa fa-bars", "fa fa-bed", "fa fa-beer", "fa fa-bell", "fa fa-bell-o", "fa fa-bell-slash", "fa fa-bell-slash-o", "fa fa-bicycle", "fa fa-binoculars", "fa fa-birthday-cake", "fa fa-bolt", "fa fa-bomb", "fa fa-book", "fa fa-bookmark", "fa fa-bookmark-o", "fa fa-briefcase", "fa fa-bug", "fa fa-building", "fa fa-building-o", "fa fa-bullhorn"],
-        socicon: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", ",", ";", ":", "+", "@", "=", "-", "^", "¨", "$", "*", "&", "(", "#", ".", "_", "]", ")", "£", "'", "\"", "}", "{"]
+        ionicons: ['ion-ionic', 'ion-arrow-right-b', 'ion-arrow-down-b', 'ion-arrow-left-b', 'ion-arrow-up-c', 'ion-arrow-right-c', 'ion-arrow-down-c', 'ion-arrow-left-c', 'ion-arrow-return-right', 'ion-arrow-return-left', 'ion-arrow-swap', 'ion-arrow-shrink', 'ion-arrow-expand', 'ion-arrow-move', 'ion-arrow-resize', 'ion-chevron-up', 'ion-chevron-right', 'ion-chevron-down', 'ion-chevron-left', 'ion-navicon-round', 'ion-navicon', 'ion-drag', 'ion-log-in', 'ion-log-out', 'ion-checkmark-round', 'ion-checkmark', 'ion-checkmark-circled', 'ion-close-round', 'ion-plus-round', 'ion-minus-round', 'ion-information', 'ion-help', 'ion-backspace-outline', 'ion-help-buoy', 'ion-asterisk', 'ion-alert', 'ion-alert-circled', 'ion-refresh', 'ion-loop', 'ion-shuffle', 'ion-home', 'ion-search', 'ion-flag', 'ion-star', 'ion-heart', 'ion-heart-broken', 'ion-gear-a', 'ion-gear-b', 'ion-toggle-filled', 'ion-toggle', 'ion-settings', 'ion-wrench', 'ion-hammer', 'ion-edit', 'ion-trash-a', 'ion-trash-b', 'ion-document', 'ion-document-text', 'ion-clipboard', 'ion-scissors', 'ion-funnel', 'ion-bookmark', 'ion-email', 'ion-email-unread', 'ion-folder', 'ion-filing', 'ion-archive', 'ion-reply', 'ion-reply-all', 'ion-forward'],
+        fontAwesomeIcons: ['fa fa-adjust', 'fa fa-anchor', 'fa fa-archive', 'fa fa-area-chart', 'fa fa-arrows', 'fa fa-arrows-h', 'fa fa-arrows-v', 'fa fa-asterisk', 'fa fa-at', 'fa fa-automobile', 'fa fa-ban', 'fa fa-bank', 'fa fa-bar-chart', 'fa fa-bar-chart-o', 'fa fa-barcode', 'fa fa-bars', 'fa fa-bed', 'fa fa-beer', 'fa fa-bell', 'fa fa-bell-o', 'fa fa-bell-slash', 'fa fa-bell-slash-o', 'fa fa-bicycle', 'fa fa-binoculars', 'fa fa-birthday-cake', 'fa fa-bolt', 'fa fa-bomb', 'fa fa-book', 'fa fa-bookmark', 'fa fa-bookmark-o', 'fa fa-briefcase', 'fa fa-bug', 'fa fa-building', 'fa fa-building-o', 'fa fa-bullhorn'],
+        socicon: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', ',', ';', ':', '+', '@', '=', '-', '^', '¨', '$', '*', '&', '(', '#', '.', '_', ']', ')', '£', '\'', '"', '}', '{']
       }
-
     }]);
\ No newline at end of file
diff --git a/src/app/pages/icons/widgets/kameleon.html b/src/app/pages/icons/widgets/kameleon.html
index 706d33e..e437341 100644
--- a/src/app/pages/icons/widgets/kameleon.html
+++ b/src/app/pages/icons/widgets/kameleon.html
@@ -1,6 +1,6 @@
 <div class="row clearfix" ng-controller="iconsPageCtrl">
   <div class="kameleon-row" ng-repeat="icon in icons.kameleonIcons">
-    <div class="kameleon-icon"><img ng-src="release/img/{{icon.img}}"><span>{{icon.name}}</span></div>
+    <div class="kameleon-icon"><img ng-src="img/{{icon.img}}"><span>{{icon.name}}</span></div>
   </div>
 </div>
 
diff --git a/src/app/pages/icons/widgets/kameleonRounded.html b/src/app/pages/icons/widgets/kameleonRounded.html
index b57ca18..535dc89 100644
--- a/src/app/pages/icons/widgets/kameleonRounded.html
+++ b/src/app/pages/icons/widgets/kameleonRounded.html
@@ -1,6 +1,6 @@
 <div class="row clearfix" ng-controller="iconsPageCtrl">
   <div class="kameleon-row" ng-repeat="icon in icons.kameleonRoundedIcons">
-    <div class="kameleon-icon with-round-bg {{icon.color}}"><img ng-src="release/img/{{icon.img}}"><span>{{ icon.name }}</span></div>
+    <div class="kameleon-icon with-round-bg {{icon.color}}"><img ng-src="img/{{icon.img}}"><span>{{ icon.name }}</span></div>
   </div>
 </div>
 
diff --git a/src/app/pages/maps/maps.js b/src/app/pages/maps/maps.js
index 0041622..fbc1e04 100644
--- a/src/app/pages/maps/maps.js
+++ b/src/app/pages/maps/maps.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.mapsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/maps', {
-        templateUrl: '/app/pages/maps/maps.html',
+        templateUrl: 'app/pages/maps/maps.html',
         controller: 'mapsPageCtrl'
       });
     }])
@@ -14,22 +14,22 @@ angular.module('BlurAdmin.mapsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Google Maps",
-                url: "/app/pages/maps/widgets/google-maps/google-maps.html"
+                title: 'Google Maps',
+                url: 'app/pages/maps/widgets/google-maps/google-maps.html'
               },
               {
-                title: "Map with Lines",
-                url: "/app/pages/maps/widgets/map-lines/map-lines.html"
+                title: 'Map with Lines',
+                url: 'app/pages/maps/widgets/map-lines/map-lines.html'
               }
             ],
             [
               {
-                title: "Map with Bubbles",
-                url: "/app/pages/maps/widgets/map-bubbles/map-bubbles.html"
+                title: 'Map with Bubbles',
+                url: 'app/pages/maps/widgets/map-bubbles/map-bubbles.html'
               },
               {
-                title: "Leaflet",
-                url: "/app/pages/maps/widgets/leaflet/leaflet.html"
+                title: 'Leaflet',
+                url: 'app/pages/maps/widgets/leaflet/leaflet.html'
               }
             ]
           ]
diff --git a/src/app/pages/maps/widgets/google-maps/google-maps.js b/src/app/pages/maps/widgets/google-maps/google-maps.js
index f5f1d5b..a5aba66 100644
--- a/src/app/pages/maps/widgets/google-maps/google-maps.js
+++ b/src/app/pages/maps/widgets/google-maps/google-maps.js
@@ -1,6 +1,6 @@
 'use strict';
 
-blurAdminApp.controller('googleMapsCtrl', ["$timeout", function ($timeout) {
+blurAdminApp.controller('googleMapsCtrl', ['$timeout', function ($timeout) {
   function initialize() {
     var mapCanvas = document.getElementById('google-maps');
     var mapOptions = {
diff --git a/src/app/pages/maps/widgets/leaflet/_leaflet.scss b/src/app/pages/maps/widgets/leaflet/_leaflet.scss
index a27422d..485ae55 100644
--- a/src/app/pages/maps/widgets/leaflet/_leaflet.scss
+++ b/src/app/pages/maps/widgets/leaflet/_leaflet.scss
@@ -296,13 +296,13 @@
 }
 
 .leaflet-control-layers-toggle {
-  background-image: url(../release/img/layers.png);
+  background-image: url(../img/layers.png);
   width: 36px;
   height: 36px;
 }
 
 .leaflet-retina .leaflet-control-layers-toggle {
-  background-image: url(../release/img/layers-2x.png);
+  background-image: url(../img/layers-2x.png);
   background-size: 26px 26px;
 }
 
diff --git a/src/app/pages/maps/widgets/leaflet/leaflet.js b/src/app/pages/maps/widgets/leaflet/leaflet.js
index 709a5c2..b6522a9 100644
--- a/src/app/pages/maps/widgets/leaflet/leaflet.js
+++ b/src/app/pages/maps/widgets/leaflet/leaflet.js
@@ -1,9 +1,9 @@
 'use strict';
 
-blurAdminApp.controller('leafletCtrl', ["$timeout", function ($timeout) {
+blurAdminApp.controller('leafletCtrl', ['$timeout', function ($timeout) {
   var map = L.map('leaflet-map').setView([51.505, -0.09], 13);
 
-  L.Icon.Default.imagePath = 'release/img';
+  L.Icon.Default.imagePath = 'img';
 
   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
     attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
diff --git a/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js b/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js
index 29948dc..14f25c9 100644
--- a/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js
+++ b/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js
@@ -3,417 +3,417 @@
 blurAdminApp.controller('mapBubblesCtrl', [function () {
 
   var latlong = {};
-  latlong["AD"] = {"latitude": 42.5, "longitude": 1.5};
-  latlong["AE"] = {"latitude": 24, "longitude": 54};
-  latlong["AF"] = {"latitude": 33, "longitude": 65};
-  latlong["AG"] = {"latitude": 17.05, "longitude": -61.8};
-  latlong["AI"] = {"latitude": 18.25, "longitude": -63.1667};
-  latlong["AL"] = {"latitude": 41, "longitude": 20};
-  latlong["AM"] = {"latitude": 40, "longitude": 45};
-  latlong["AN"] = {"latitude": 12.25, "longitude": -68.75};
-  latlong["AO"] = {"latitude": -12.5, "longitude": 18.5};
-  latlong["AP"] = {"latitude": 35, "longitude": 105};
-  latlong["AQ"] = {"latitude": -90, "longitude": 0};
-  latlong["AR"] = {"latitude": -34, "longitude": -64};
-  latlong["AS"] = {"latitude": -14.3333, "longitude": -170};
-  latlong["AT"] = {"latitude": 47.3333, "longitude": 13.3333};
-  latlong["AU"] = {"latitude": -27, "longitude": 133};
-  latlong["AW"] = {"latitude": 12.5, "longitude": -69.9667};
-  latlong["AZ"] = {"latitude": 40.5, "longitude": 47.5};
-  latlong["BA"] = {"latitude": 44, "longitude": 18};
-  latlong["BB"] = {"latitude": 13.1667, "longitude": -59.5333};
-  latlong["BD"] = {"latitude": 24, "longitude": 90};
-  latlong["BE"] = {"latitude": 50.8333, "longitude": 4};
-  latlong["BF"] = {"latitude": 13, "longitude": -2};
-  latlong["BG"] = {"latitude": 43, "longitude": 25};
-  latlong["BH"] = {"latitude": 26, "longitude": 50.55};
-  latlong["BI"] = {"latitude": -3.5, "longitude": 30};
-  latlong["BJ"] = {"latitude": 9.5, "longitude": 2.25};
-  latlong["BM"] = {"latitude": 32.3333, "longitude": -64.75};
-  latlong["BN"] = {"latitude": 4.5, "longitude": 114.6667};
-  latlong["BO"] = {"latitude": -17, "longitude": -65};
-  latlong["BR"] = {"latitude": -10, "longitude": -55};
-  latlong["BS"] = {"latitude": 24.25, "longitude": -76};
-  latlong["BT"] = {"latitude": 27.5, "longitude": 90.5};
-  latlong["BV"] = {"latitude": -54.4333, "longitude": 3.4};
-  latlong["BW"] = {"latitude": -22, "longitude": 24};
-  latlong["BY"] = {"latitude": 53, "longitude": 28};
-  latlong["BZ"] = {"latitude": 17.25, "longitude": -88.75};
-  latlong["CA"] = {"latitude": 54, "longitude": -100};
-  latlong["CC"] = {"latitude": -12.5, "longitude": 96.8333};
-  latlong["CD"] = {"latitude": 0, "longitude": 25};
-  latlong["CF"] = {"latitude": 7, "longitude": 21};
-  latlong["CG"] = {"latitude": -1, "longitude": 15};
-  latlong["CH"] = {"latitude": 47, "longitude": 8};
-  latlong["CI"] = {"latitude": 8, "longitude": -5};
-  latlong["CK"] = {"latitude": -21.2333, "longitude": -159.7667};
-  latlong["CL"] = {"latitude": -30, "longitude": -71};
-  latlong["CM"] = {"latitude": 6, "longitude": 12};
-  latlong["CN"] = {"latitude": 35, "longitude": 105};
-  latlong["CO"] = {"latitude": 4, "longitude": -72};
-  latlong["CR"] = {"latitude": 10, "longitude": -84};
-  latlong["CU"] = {"latitude": 21.5, "longitude": -80};
-  latlong["CV"] = {"latitude": 16, "longitude": -24};
-  latlong["CX"] = {"latitude": -10.5, "longitude": 105.6667};
-  latlong["CY"] = {"latitude": 35, "longitude": 33};
-  latlong["CZ"] = {"latitude": 49.75, "longitude": 15.5};
-  latlong["DE"] = {"latitude": 51, "longitude": 9};
-  latlong["DJ"] = {"latitude": 11.5, "longitude": 43};
-  latlong["DK"] = {"latitude": 56, "longitude": 10};
-  latlong["DM"] = {"latitude": 15.4167, "longitude": -61.3333};
-  latlong["DO"] = {"latitude": 19, "longitude": -70.6667};
-  latlong["DZ"] = {"latitude": 28, "longitude": 3};
-  latlong["EC"] = {"latitude": -2, "longitude": -77.5};
-  latlong["EE"] = {"latitude": 59, "longitude": 26};
-  latlong["EG"] = {"latitude": 27, "longitude": 30};
-  latlong["EH"] = {"latitude": 24.5, "longitude": -13};
-  latlong["ER"] = {"latitude": 15, "longitude": 39};
-  latlong["ES"] = {"latitude": 40, "longitude": -4};
-  latlong["ET"] = {"latitude": 8, "longitude": 38};
-  latlong["EU"] = {"latitude": 47, "longitude": 8};
-  latlong["FI"] = {"latitude": 62, "longitude": 26};
-  latlong["FJ"] = {"latitude": -18, "longitude": 175};
-  latlong["FK"] = {"latitude": -51.75, "longitude": -59};
-  latlong["FM"] = {"latitude": 6.9167, "longitude": 158.25};
-  latlong["FO"] = {"latitude": 62, "longitude": -7};
-  latlong["FR"] = {"latitude": 46, "longitude": 2};
-  latlong["GA"] = {"latitude": -1, "longitude": 11.75};
-  latlong["GB"] = {"latitude": 54, "longitude": -2};
-  latlong["GD"] = {"latitude": 12.1167, "longitude": -61.6667};
-  latlong["GE"] = {"latitude": 42, "longitude": 43.5};
-  latlong["GF"] = {"latitude": 4, "longitude": -53};
-  latlong["GH"] = {"latitude": 8, "longitude": -2};
-  latlong["GI"] = {"latitude": 36.1833, "longitude": -5.3667};
-  latlong["GL"] = {"latitude": 72, "longitude": -40};
-  latlong["GM"] = {"latitude": 13.4667, "longitude": -16.5667};
-  latlong["GN"] = {"latitude": 11, "longitude": -10};
-  latlong["GP"] = {"latitude": 16.25, "longitude": -61.5833};
-  latlong["GQ"] = {"latitude": 2, "longitude": 10};
-  latlong["GR"] = {"latitude": 39, "longitude": 22};
-  latlong["GS"] = {"latitude": -54.5, "longitude": -37};
-  latlong["GT"] = {"latitude": 15.5, "longitude": -90.25};
-  latlong["GU"] = {"latitude": 13.4667, "longitude": 144.7833};
-  latlong["GW"] = {"latitude": 12, "longitude": -15};
-  latlong["GY"] = {"latitude": 5, "longitude": -59};
-  latlong["HK"] = {"latitude": 22.25, "longitude": 114.1667};
-  latlong["HM"] = {"latitude": -53.1, "longitude": 72.5167};
-  latlong["HN"] = {"latitude": 15, "longitude": -86.5};
-  latlong["HR"] = {"latitude": 45.1667, "longitude": 15.5};
-  latlong["HT"] = {"latitude": 19, "longitude": -72.4167};
-  latlong["HU"] = {"latitude": 47, "longitude": 20};
-  latlong["ID"] = {"latitude": -5, "longitude": 120};
-  latlong["IE"] = {"latitude": 53, "longitude": -8};
-  latlong["IL"] = {"latitude": 31.5, "longitude": 34.75};
-  latlong["IN"] = {"latitude": 20, "longitude": 77};
-  latlong["IO"] = {"latitude": -6, "longitude": 71.5};
-  latlong["IQ"] = {"latitude": 33, "longitude": 44};
-  latlong["IR"] = {"latitude": 32, "longitude": 53};
-  latlong["IS"] = {"latitude": 65, "longitude": -18};
-  latlong["IT"] = {"latitude": 42.8333, "longitude": 12.8333};
-  latlong["JM"] = {"latitude": 18.25, "longitude": -77.5};
-  latlong["JO"] = {"latitude": 31, "longitude": 36};
-  latlong["JP"] = {"latitude": 36, "longitude": 138};
-  latlong["KE"] = {"latitude": 1, "longitude": 38};
-  latlong["KG"] = {"latitude": 41, "longitude": 75};
-  latlong["KH"] = {"latitude": 13, "longitude": 105};
-  latlong["KI"] = {"latitude": 1.4167, "longitude": 173};
-  latlong["KM"] = {"latitude": -12.1667, "longitude": 44.25};
-  latlong["KN"] = {"latitude": 17.3333, "longitude": -62.75};
-  latlong["KP"] = {"latitude": 40, "longitude": 127};
-  latlong["KR"] = {"latitude": 37, "longitude": 127.5};
-  latlong["KW"] = {"latitude": 29.3375, "longitude": 47.6581};
-  latlong["KY"] = {"latitude": 19.5, "longitude": -80.5};
-  latlong["KZ"] = {"latitude": 48, "longitude": 68};
-  latlong["LA"] = {"latitude": 18, "longitude": 105};
-  latlong["LB"] = {"latitude": 33.8333, "longitude": 35.8333};
-  latlong["LC"] = {"latitude": 13.8833, "longitude": -61.1333};
-  latlong["LI"] = {"latitude": 47.1667, "longitude": 9.5333};
-  latlong["LK"] = {"latitude": 7, "longitude": 81};
-  latlong["LR"] = {"latitude": 6.5, "longitude": -9.5};
-  latlong["LS"] = {"latitude": -29.5, "longitude": 28.5};
-  latlong["LT"] = {"latitude": 55, "longitude": 24};
-  latlong["LU"] = {"latitude": 49.75, "longitude": 6};
-  latlong["LV"] = {"latitude": 57, "longitude": 25};
-  latlong["LY"] = {"latitude": 25, "longitude": 17};
-  latlong["MA"] = {"latitude": 32, "longitude": -5};
-  latlong["MC"] = {"latitude": 43.7333, "longitude": 7.4};
-  latlong["MD"] = {"latitude": 47, "longitude": 29};
-  latlong["ME"] = {"latitude": 42.5, "longitude": 19.4};
-  latlong["MG"] = {"latitude": -20, "longitude": 47};
-  latlong["MH"] = {"latitude": 9, "longitude": 168};
-  latlong["MK"] = {"latitude": 41.8333, "longitude": 22};
-  latlong["ML"] = {"latitude": 17, "longitude": -4};
-  latlong["MM"] = {"latitude": 22, "longitude": 98};
-  latlong["MN"] = {"latitude": 46, "longitude": 105};
-  latlong["MO"] = {"latitude": 22.1667, "longitude": 113.55};
-  latlong["MP"] = {"latitude": 15.2, "longitude": 145.75};
-  latlong["MQ"] = {"latitude": 14.6667, "longitude": -61};
-  latlong["MR"] = {"latitude": 20, "longitude": -12};
-  latlong["MS"] = {"latitude": 16.75, "longitude": -62.2};
-  latlong["MT"] = {"latitude": 35.8333, "longitude": 14.5833};
-  latlong["MU"] = {"latitude": -20.2833, "longitude": 57.55};
-  latlong["MV"] = {"latitude": 3.25, "longitude": 73};
-  latlong["MW"] = {"latitude": -13.5, "longitude": 34};
-  latlong["MX"] = {"latitude": 23, "longitude": -102};
-  latlong["MY"] = {"latitude": 2.5, "longitude": 112.5};
-  latlong["MZ"] = {"latitude": -18.25, "longitude": 35};
-  latlong["NA"] = {"latitude": -22, "longitude": 17};
-  latlong["NC"] = {"latitude": -21.5, "longitude": 165.5};
-  latlong["NE"] = {"latitude": 16, "longitude": 8};
-  latlong["NF"] = {"latitude": -29.0333, "longitude": 167.95};
-  latlong["NG"] = {"latitude": 10, "longitude": 8};
-  latlong["NI"] = {"latitude": 13, "longitude": -85};
-  latlong["NL"] = {"latitude": 52.5, "longitude": 5.75};
-  latlong["NO"] = {"latitude": 62, "longitude": 10};
-  latlong["NP"] = {"latitude": 28, "longitude": 84};
-  latlong["NR"] = {"latitude": -0.5333, "longitude": 166.9167};
-  latlong["NU"] = {"latitude": -19.0333, "longitude": -169.8667};
-  latlong["NZ"] = {"latitude": -41, "longitude": 174};
-  latlong["OM"] = {"latitude": 21, "longitude": 57};
-  latlong["PA"] = {"latitude": 9, "longitude": -80};
-  latlong["PE"] = {"latitude": -10, "longitude": -76};
-  latlong["PF"] = {"latitude": -15, "longitude": -140};
-  latlong["PG"] = {"latitude": -6, "longitude": 147};
-  latlong["PH"] = {"latitude": 13, "longitude": 122};
-  latlong["PK"] = {"latitude": 30, "longitude": 70};
-  latlong["PL"] = {"latitude": 52, "longitude": 20};
-  latlong["PM"] = {"latitude": 46.8333, "longitude": -56.3333};
-  latlong["PR"] = {"latitude": 18.25, "longitude": -66.5};
-  latlong["PS"] = {"latitude": 32, "longitude": 35.25};
-  latlong["PT"] = {"latitude": 39.5, "longitude": -8};
-  latlong["PW"] = {"latitude": 7.5, "longitude": 134.5};
-  latlong["PY"] = {"latitude": -23, "longitude": -58};
-  latlong["QA"] = {"latitude": 25.5, "longitude": 51.25};
-  latlong["RE"] = {"latitude": -21.1, "longitude": 55.6};
-  latlong["RO"] = {"latitude": 46, "longitude": 25};
-  latlong["RS"] = {"latitude": 44, "longitude": 21};
-  latlong["RU"] = {"latitude": 60, "longitude": 100};
-  latlong["RW"] = {"latitude": -2, "longitude": 30};
-  latlong["SA"] = {"latitude": 25, "longitude": 45};
-  latlong["SB"] = {"latitude": -8, "longitude": 159};
-  latlong["SC"] = {"latitude": -4.5833, "longitude": 55.6667};
-  latlong["SD"] = {"latitude": 15, "longitude": 30};
-  latlong["SE"] = {"latitude": 62, "longitude": 15};
-  latlong["SG"] = {"latitude": 1.3667, "longitude": 103.8};
-  latlong["SH"] = {"latitude": -15.9333, "longitude": -5.7};
-  latlong["SI"] = {"latitude": 46, "longitude": 15};
-  latlong["SJ"] = {"latitude": 78, "longitude": 20};
-  latlong["SK"] = {"latitude": 48.6667, "longitude": 19.5};
-  latlong["SL"] = {"latitude": 8.5, "longitude": -11.5};
-  latlong["SM"] = {"latitude": 43.7667, "longitude": 12.4167};
-  latlong["SN"] = {"latitude": 14, "longitude": -14};
-  latlong["SO"] = {"latitude": 10, "longitude": 49};
-  latlong["SR"] = {"latitude": 4, "longitude": -56};
-  latlong["ST"] = {"latitude": 1, "longitude": 7};
-  latlong["SV"] = {"latitude": 13.8333, "longitude": -88.9167};
-  latlong["SY"] = {"latitude": 35, "longitude": 38};
-  latlong["SZ"] = {"latitude": -26.5, "longitude": 31.5};
-  latlong["TC"] = {"latitude": 21.75, "longitude": -71.5833};
-  latlong["TD"] = {"latitude": 15, "longitude": 19};
-  latlong["TF"] = {"latitude": -43, "longitude": 67};
-  latlong["TG"] = {"latitude": 8, "longitude": 1.1667};
-  latlong["TH"] = {"latitude": 15, "longitude": 100};
-  latlong["TJ"] = {"latitude": 39, "longitude": 71};
-  latlong["TK"] = {"latitude": -9, "longitude": -172};
-  latlong["TM"] = {"latitude": 40, "longitude": 60};
-  latlong["TN"] = {"latitude": 34, "longitude": 9};
-  latlong["TO"] = {"latitude": -20, "longitude": -175};
-  latlong["TR"] = {"latitude": 39, "longitude": 35};
-  latlong["TT"] = {"latitude": 11, "longitude": -61};
-  latlong["TV"] = {"latitude": -8, "longitude": 178};
-  latlong["TW"] = {"latitude": 23.5, "longitude": 121};
-  latlong["TZ"] = {"latitude": -6, "longitude": 35};
-  latlong["UA"] = {"latitude": 49, "longitude": 32};
-  latlong["UG"] = {"latitude": 1, "longitude": 32};
-  latlong["UM"] = {"latitude": 19.2833, "longitude": 166.6};
-  latlong["US"] = {"latitude": 38, "longitude": -97};
-  latlong["UY"] = {"latitude": -33, "longitude": -56};
-  latlong["UZ"] = {"latitude": 41, "longitude": 64};
-  latlong["VA"] = {"latitude": 41.9, "longitude": 12.45};
-  latlong["VC"] = {"latitude": 13.25, "longitude": -61.2};
-  latlong["VE"] = {"latitude": 8, "longitude": -66};
-  latlong["VG"] = {"latitude": 18.5, "longitude": -64.5};
-  latlong["VI"] = {"latitude": 18.3333, "longitude": -64.8333};
-  latlong["VN"] = {"latitude": 16, "longitude": 106};
-  latlong["VU"] = {"latitude": -16, "longitude": 167};
-  latlong["WF"] = {"latitude": -13.3, "longitude": -176.2};
-  latlong["WS"] = {"latitude": -13.5833, "longitude": -172.3333};
-  latlong["YE"] = {"latitude": 15, "longitude": 48};
-  latlong["YT"] = {"latitude": -12.8333, "longitude": 45.1667};
-  latlong["ZA"] = {"latitude": -29, "longitude": 24};
-  latlong["ZM"] = {"latitude": -15, "longitude": 30};
-  latlong["ZW"] = {"latitude": -20, "longitude": 30};
+  latlong['AD'] = {'latitude': 42.5, 'longitude': 1.5};
+  latlong['AE'] = {'latitude': 24, 'longitude': 54};
+  latlong['AF'] = {'latitude': 33, 'longitude': 65};
+  latlong['AG'] = {'latitude': 17.05, 'longitude': -61.8};
+  latlong['AI'] = {'latitude': 18.25, 'longitude': -63.1667};
+  latlong['AL'] = {'latitude': 41, 'longitude': 20};
+  latlong['AM'] = {'latitude': 40, 'longitude': 45};
+  latlong['AN'] = {'latitude': 12.25, 'longitude': -68.75};
+  latlong['AO'] = {'latitude': -12.5, 'longitude': 18.5};
+  latlong['AP'] = {'latitude': 35, 'longitude': 105};
+  latlong['AQ'] = {'latitude': -90, 'longitude': 0};
+  latlong['AR'] = {'latitude': -34, 'longitude': -64};
+  latlong['AS'] = {'latitude': -14.3333, 'longitude': -170};
+  latlong['AT'] = {'latitude': 47.3333, 'longitude': 13.3333};
+  latlong['AU'] = {'latitude': -27, 'longitude': 133};
+  latlong['AW'] = {'latitude': 12.5, 'longitude': -69.9667};
+  latlong['AZ'] = {'latitude': 40.5, 'longitude': 47.5};
+  latlong['BA'] = {'latitude': 44, 'longitude': 18};
+  latlong['BB'] = {'latitude': 13.1667, 'longitude': -59.5333};
+  latlong['BD'] = {'latitude': 24, 'longitude': 90};
+  latlong['BE'] = {'latitude': 50.8333, 'longitude': 4};
+  latlong['BF'] = {'latitude': 13, 'longitude': -2};
+  latlong['BG'] = {'latitude': 43, 'longitude': 25};
+  latlong['BH'] = {'latitude': 26, 'longitude': 50.55};
+  latlong['BI'] = {'latitude': -3.5, 'longitude': 30};
+  latlong['BJ'] = {'latitude': 9.5, 'longitude': 2.25};
+  latlong['BM'] = {'latitude': 32.3333, 'longitude': -64.75};
+  latlong['BN'] = {'latitude': 4.5, 'longitude': 114.6667};
+  latlong['BO'] = {'latitude': -17, 'longitude': -65};
+  latlong['BR'] = {'latitude': -10, 'longitude': -55};
+  latlong['BS'] = {'latitude': 24.25, 'longitude': -76};
+  latlong['BT'] = {'latitude': 27.5, 'longitude': 90.5};
+  latlong['BV'] = {'latitude': -54.4333, 'longitude': 3.4};
+  latlong['BW'] = {'latitude': -22, 'longitude': 24};
+  latlong['BY'] = {'latitude': 53, 'longitude': 28};
+  latlong['BZ'] = {'latitude': 17.25, 'longitude': -88.75};
+  latlong['CA'] = {'latitude': 54, 'longitude': -100};
+  latlong['CC'] = {'latitude': -12.5, 'longitude': 96.8333};
+  latlong['CD'] = {'latitude': 0, 'longitude': 25};
+  latlong['CF'] = {'latitude': 7, 'longitude': 21};
+  latlong['CG'] = {'latitude': -1, 'longitude': 15};
+  latlong['CH'] = {'latitude': 47, 'longitude': 8};
+  latlong['CI'] = {'latitude': 8, 'longitude': -5};
+  latlong['CK'] = {'latitude': -21.2333, 'longitude': -159.7667};
+  latlong['CL'] = {'latitude': -30, 'longitude': -71};
+  latlong['CM'] = {'latitude': 6, 'longitude': 12};
+  latlong['CN'] = {'latitude': 35, 'longitude': 105};
+  latlong['CO'] = {'latitude': 4, 'longitude': -72};
+  latlong['CR'] = {'latitude': 10, 'longitude': -84};
+  latlong['CU'] = {'latitude': 21.5, 'longitude': -80};
+  latlong['CV'] = {'latitude': 16, 'longitude': -24};
+  latlong['CX'] = {'latitude': -10.5, 'longitude': 105.6667};
+  latlong['CY'] = {'latitude': 35, 'longitude': 33};
+  latlong['CZ'] = {'latitude': 49.75, 'longitude': 15.5};
+  latlong['DE'] = {'latitude': 51, 'longitude': 9};
+  latlong['DJ'] = {'latitude': 11.5, 'longitude': 43};
+  latlong['DK'] = {'latitude': 56, 'longitude': 10};
+  latlong['DM'] = {'latitude': 15.4167, 'longitude': -61.3333};
+  latlong['DO'] = {'latitude': 19, 'longitude': -70.6667};
+  latlong['DZ'] = {'latitude': 28, 'longitude': 3};
+  latlong['EC'] = {'latitude': -2, 'longitude': -77.5};
+  latlong['EE'] = {'latitude': 59, 'longitude': 26};
+  latlong['EG'] = {'latitude': 27, 'longitude': 30};
+  latlong['EH'] = {'latitude': 24.5, 'longitude': -13};
+  latlong['ER'] = {'latitude': 15, 'longitude': 39};
+  latlong['ES'] = {'latitude': 40, 'longitude': -4};
+  latlong['ET'] = {'latitude': 8, 'longitude': 38};
+  latlong['EU'] = {'latitude': 47, 'longitude': 8};
+  latlong['FI'] = {'latitude': 62, 'longitude': 26};
+  latlong['FJ'] = {'latitude': -18, 'longitude': 175};
+  latlong['FK'] = {'latitude': -51.75, 'longitude': -59};
+  latlong['FM'] = {'latitude': 6.9167, 'longitude': 158.25};
+  latlong['FO'] = {'latitude': 62, 'longitude': -7};
+  latlong['FR'] = {'latitude': 46, 'longitude': 2};
+  latlong['GA'] = {'latitude': -1, 'longitude': 11.75};
+  latlong['GB'] = {'latitude': 54, 'longitude': -2};
+  latlong['GD'] = {'latitude': 12.1167, 'longitude': -61.6667};
+  latlong['GE'] = {'latitude': 42, 'longitude': 43.5};
+  latlong['GF'] = {'latitude': 4, 'longitude': -53};
+  latlong['GH'] = {'latitude': 8, 'longitude': -2};
+  latlong['GI'] = {'latitude': 36.1833, 'longitude': -5.3667};
+  latlong['GL'] = {'latitude': 72, 'longitude': -40};
+  latlong['GM'] = {'latitude': 13.4667, 'longitude': -16.5667};
+  latlong['GN'] = {'latitude': 11, 'longitude': -10};
+  latlong['GP'] = {'latitude': 16.25, 'longitude': -61.5833};
+  latlong['GQ'] = {'latitude': 2, 'longitude': 10};
+  latlong['GR'] = {'latitude': 39, 'longitude': 22};
+  latlong['GS'] = {'latitude': -54.5, 'longitude': -37};
+  latlong['GT'] = {'latitude': 15.5, 'longitude': -90.25};
+  latlong['GU'] = {'latitude': 13.4667, 'longitude': 144.7833};
+  latlong['GW'] = {'latitude': 12, 'longitude': -15};
+  latlong['GY'] = {'latitude': 5, 'longitude': -59};
+  latlong['HK'] = {'latitude': 22.25, 'longitude': 114.1667};
+  latlong['HM'] = {'latitude': -53.1, 'longitude': 72.5167};
+  latlong['HN'] = {'latitude': 15, 'longitude': -86.5};
+  latlong['HR'] = {'latitude': 45.1667, 'longitude': 15.5};
+  latlong['HT'] = {'latitude': 19, 'longitude': -72.4167};
+  latlong['HU'] = {'latitude': 47, 'longitude': 20};
+  latlong['ID'] = {'latitude': -5, 'longitude': 120};
+  latlong['IE'] = {'latitude': 53, 'longitude': -8};
+  latlong['IL'] = {'latitude': 31.5, 'longitude': 34.75};
+  latlong['IN'] = {'latitude': 20, 'longitude': 77};
+  latlong['IO'] = {'latitude': -6, 'longitude': 71.5};
+  latlong['IQ'] = {'latitude': 33, 'longitude': 44};
+  latlong['IR'] = {'latitude': 32, 'longitude': 53};
+  latlong['IS'] = {'latitude': 65, 'longitude': -18};
+  latlong['IT'] = {'latitude': 42.8333, 'longitude': 12.8333};
+  latlong['JM'] = {'latitude': 18.25, 'longitude': -77.5};
+  latlong['JO'] = {'latitude': 31, 'longitude': 36};
+  latlong['JP'] = {'latitude': 36, 'longitude': 138};
+  latlong['KE'] = {'latitude': 1, 'longitude': 38};
+  latlong['KG'] = {'latitude': 41, 'longitude': 75};
+  latlong['KH'] = {'latitude': 13, 'longitude': 105};
+  latlong['KI'] = {'latitude': 1.4167, 'longitude': 173};
+  latlong['KM'] = {'latitude': -12.1667, 'longitude': 44.25};
+  latlong['KN'] = {'latitude': 17.3333, 'longitude': -62.75};
+  latlong['KP'] = {'latitude': 40, 'longitude': 127};
+  latlong['KR'] = {'latitude': 37, 'longitude': 127.5};
+  latlong['KW'] = {'latitude': 29.3375, 'longitude': 47.6581};
+  latlong['KY'] = {'latitude': 19.5, 'longitude': -80.5};
+  latlong['KZ'] = {'latitude': 48, 'longitude': 68};
+  latlong['LA'] = {'latitude': 18, 'longitude': 105};
+  latlong['LB'] = {'latitude': 33.8333, 'longitude': 35.8333};
+  latlong['LC'] = {'latitude': 13.8833, 'longitude': -61.1333};
+  latlong['LI'] = {'latitude': 47.1667, 'longitude': 9.5333};
+  latlong['LK'] = {'latitude': 7, 'longitude': 81};
+  latlong['LR'] = {'latitude': 6.5, 'longitude': -9.5};
+  latlong['LS'] = {'latitude': -29.5, 'longitude': 28.5};
+  latlong['LT'] = {'latitude': 55, 'longitude': 24};
+  latlong['LU'] = {'latitude': 49.75, 'longitude': 6};
+  latlong['LV'] = {'latitude': 57, 'longitude': 25};
+  latlong['LY'] = {'latitude': 25, 'longitude': 17};
+  latlong['MA'] = {'latitude': 32, 'longitude': -5};
+  latlong['MC'] = {'latitude': 43.7333, 'longitude': 7.4};
+  latlong['MD'] = {'latitude': 47, 'longitude': 29};
+  latlong['ME'] = {'latitude': 42.5, 'longitude': 19.4};
+  latlong['MG'] = {'latitude': -20, 'longitude': 47};
+  latlong['MH'] = {'latitude': 9, 'longitude': 168};
+  latlong['MK'] = {'latitude': 41.8333, 'longitude': 22};
+  latlong['ML'] = {'latitude': 17, 'longitude': -4};
+  latlong['MM'] = {'latitude': 22, 'longitude': 98};
+  latlong['MN'] = {'latitude': 46, 'longitude': 105};
+  latlong['MO'] = {'latitude': 22.1667, 'longitude': 113.55};
+  latlong['MP'] = {'latitude': 15.2, 'longitude': 145.75};
+  latlong['MQ'] = {'latitude': 14.6667, 'longitude': -61};
+  latlong['MR'] = {'latitude': 20, 'longitude': -12};
+  latlong['MS'] = {'latitude': 16.75, 'longitude': -62.2};
+  latlong['MT'] = {'latitude': 35.8333, 'longitude': 14.5833};
+  latlong['MU'] = {'latitude': -20.2833, 'longitude': 57.55};
+  latlong['MV'] = {'latitude': 3.25, 'longitude': 73};
+  latlong['MW'] = {'latitude': -13.5, 'longitude': 34};
+  latlong['MX'] = {'latitude': 23, 'longitude': -102};
+  latlong['MY'] = {'latitude': 2.5, 'longitude': 112.5};
+  latlong['MZ'] = {'latitude': -18.25, 'longitude': 35};
+  latlong['NA'] = {'latitude': -22, 'longitude': 17};
+  latlong['NC'] = {'latitude': -21.5, 'longitude': 165.5};
+  latlong['NE'] = {'latitude': 16, 'longitude': 8};
+  latlong['NF'] = {'latitude': -29.0333, 'longitude': 167.95};
+  latlong['NG'] = {'latitude': 10, 'longitude': 8};
+  latlong['NI'] = {'latitude': 13, 'longitude': -85};
+  latlong['NL'] = {'latitude': 52.5, 'longitude': 5.75};
+  latlong['NO'] = {'latitude': 62, 'longitude': 10};
+  latlong['NP'] = {'latitude': 28, 'longitude': 84};
+  latlong['NR'] = {'latitude': -0.5333, 'longitude': 166.9167};
+  latlong['NU'] = {'latitude': -19.0333, 'longitude': -169.8667};
+  latlong['NZ'] = {'latitude': -41, 'longitude': 174};
+  latlong['OM'] = {'latitude': 21, 'longitude': 57};
+  latlong['PA'] = {'latitude': 9, 'longitude': -80};
+  latlong['PE'] = {'latitude': -10, 'longitude': -76};
+  latlong['PF'] = {'latitude': -15, 'longitude': -140};
+  latlong['PG'] = {'latitude': -6, 'longitude': 147};
+  latlong['PH'] = {'latitude': 13, 'longitude': 122};
+  latlong['PK'] = {'latitude': 30, 'longitude': 70};
+  latlong['PL'] = {'latitude': 52, 'longitude': 20};
+  latlong['PM'] = {'latitude': 46.8333, 'longitude': -56.3333};
+  latlong['PR'] = {'latitude': 18.25, 'longitude': -66.5};
+  latlong['PS'] = {'latitude': 32, 'longitude': 35.25};
+  latlong['PT'] = {'latitude': 39.5, 'longitude': -8};
+  latlong['PW'] = {'latitude': 7.5, 'longitude': 134.5};
+  latlong['PY'] = {'latitude': -23, 'longitude': -58};
+  latlong['QA'] = {'latitude': 25.5, 'longitude': 51.25};
+  latlong['RE'] = {'latitude': -21.1, 'longitude': 55.6};
+  latlong['RO'] = {'latitude': 46, 'longitude': 25};
+  latlong['RS'] = {'latitude': 44, 'longitude': 21};
+  latlong['RU'] = {'latitude': 60, 'longitude': 100};
+  latlong['RW'] = {'latitude': -2, 'longitude': 30};
+  latlong['SA'] = {'latitude': 25, 'longitude': 45};
+  latlong['SB'] = {'latitude': -8, 'longitude': 159};
+  latlong['SC'] = {'latitude': -4.5833, 'longitude': 55.6667};
+  latlong['SD'] = {'latitude': 15, 'longitude': 30};
+  latlong['SE'] = {'latitude': 62, 'longitude': 15};
+  latlong['SG'] = {'latitude': 1.3667, 'longitude': 103.8};
+  latlong['SH'] = {'latitude': -15.9333, 'longitude': -5.7};
+  latlong['SI'] = {'latitude': 46, 'longitude': 15};
+  latlong['SJ'] = {'latitude': 78, 'longitude': 20};
+  latlong['SK'] = {'latitude': 48.6667, 'longitude': 19.5};
+  latlong['SL'] = {'latitude': 8.5, 'longitude': -11.5};
+  latlong['SM'] = {'latitude': 43.7667, 'longitude': 12.4167};
+  latlong['SN'] = {'latitude': 14, 'longitude': -14};
+  latlong['SO'] = {'latitude': 10, 'longitude': 49};
+  latlong['SR'] = {'latitude': 4, 'longitude': -56};
+  latlong['ST'] = {'latitude': 1, 'longitude': 7};
+  latlong['SV'] = {'latitude': 13.8333, 'longitude': -88.9167};
+  latlong['SY'] = {'latitude': 35, 'longitude': 38};
+  latlong['SZ'] = {'latitude': -26.5, 'longitude': 31.5};
+  latlong['TC'] = {'latitude': 21.75, 'longitude': -71.5833};
+  latlong['TD'] = {'latitude': 15, 'longitude': 19};
+  latlong['TF'] = {'latitude': -43, 'longitude': 67};
+  latlong['TG'] = {'latitude': 8, 'longitude': 1.1667};
+  latlong['TH'] = {'latitude': 15, 'longitude': 100};
+  latlong['TJ'] = {'latitude': 39, 'longitude': 71};
+  latlong['TK'] = {'latitude': -9, 'longitude': -172};
+  latlong['TM'] = {'latitude': 40, 'longitude': 60};
+  latlong['TN'] = {'latitude': 34, 'longitude': 9};
+  latlong['TO'] = {'latitude': -20, 'longitude': -175};
+  latlong['TR'] = {'latitude': 39, 'longitude': 35};
+  latlong['TT'] = {'latitude': 11, 'longitude': -61};
+  latlong['TV'] = {'latitude': -8, 'longitude': 178};
+  latlong['TW'] = {'latitude': 23.5, 'longitude': 121};
+  latlong['TZ'] = {'latitude': -6, 'longitude': 35};
+  latlong['UA'] = {'latitude': 49, 'longitude': 32};
+  latlong['UG'] = {'latitude': 1, 'longitude': 32};
+  latlong['UM'] = {'latitude': 19.2833, 'longitude': 166.6};
+  latlong['US'] = {'latitude': 38, 'longitude': -97};
+  latlong['UY'] = {'latitude': -33, 'longitude': -56};
+  latlong['UZ'] = {'latitude': 41, 'longitude': 64};
+  latlong['VA'] = {'latitude': 41.9, 'longitude': 12.45};
+  latlong['VC'] = {'latitude': 13.25, 'longitude': -61.2};
+  latlong['VE'] = {'latitude': 8, 'longitude': -66};
+  latlong['VG'] = {'latitude': 18.5, 'longitude': -64.5};
+  latlong['VI'] = {'latitude': 18.3333, 'longitude': -64.8333};
+  latlong['VN'] = {'latitude': 16, 'longitude': 106};
+  latlong['VU'] = {'latitude': -16, 'longitude': 167};
+  latlong['WF'] = {'latitude': -13.3, 'longitude': -176.2};
+  latlong['WS'] = {'latitude': -13.5833, 'longitude': -172.3333};
+  latlong['YE'] = {'latitude': 15, 'longitude': 48};
+  latlong['YT'] = {'latitude': -12.8333, 'longitude': 45.1667};
+  latlong['ZA'] = {'latitude': -29, 'longitude': 24};
+  latlong['ZM'] = {'latitude': -15, 'longitude': 30};
+  latlong['ZW'] = {'latitude': -20, 'longitude': 30};
 
   var mapData = [
-    {"code": "AF", "name": "Afghanistan", "value": 32358260, "color": colorPrimaryDark},
-    {"code": "AL", "name": "Albania", "value": 3215988, "color": colorWarning},
-    {"code": "DZ", "name": "Algeria", "value": 35980193, "color": colorDanger},
-    {"code": "AO", "name": "Angola", "value": 19618432, "color": colorDanger},
-    {"code": "AR", "name": "Argentina", "value": 40764561, "color": colorSuccess},
-    {"code": "AM", "name": "Armenia", "value": 3100236, "color": colorWarning},
-    {"code": "AU", "name": "Australia", "value": 22605732, "color": colorWarningDark},
-    {"code": "AT", "name": "Austria", "value": 8413429, "color": colorWarning},
-    {"code": "AZ", "name": "Azerbaijan", "value": 9306023, "color": colorWarning},
-    {"code": "BH", "name": "Bahrain", "value": 1323535, "color": colorPrimaryDark},
-    {"code": "BD", "name": "Bangladesh", "value": 150493658, "color": colorPrimaryDark},
-    {"code": "BY", "name": "Belarus", "value": 9559441, "color": colorWarning},
-    {"code": "BE", "name": "Belgium", "value": 10754056, "color": colorWarning},
-    {"code": "BJ", "name": "Benin", "value": 9099922, "color": colorDanger},
-    {"code": "BT", "name": "Bhutan", "value": 738267, "color": colorPrimaryDark},
-    {"code": "BO", "name": "Bolivia", "value": 10088108, "color": colorSuccess},
-    {"code": "BA", "name": "Bosnia and Herzegovina", "value": 3752228, "color": colorWarning},
-    {"code": "BW", "name": "Botswana", "value": 2030738, "color": colorDanger},
-    {"code": "BR", "name": "Brazil", "value": 196655014, "color": colorSuccess},
-    {"code": "BN", "name": "Brunei", "value": 405938, "color": colorPrimaryDark},
-    {"code": "BG", "name": "Bulgaria", "value": 7446135, "color": colorWarning},
-    {"code": "BF", "name": "Burkina Faso", "value": 16967845, "color": colorDanger},
-    {"code": "BI", "name": "Burundi", "value": 8575172, "color": colorDanger},
-    {"code": "KH", "name": "Cambodia", "value": 14305183, "color": colorPrimaryDark},
-    {"code": "CM", "name": "Cameroon", "value": 20030362, "color": colorDanger},
-    {"code": "CA", "name": "Canada", "value": 34349561, "color": colorPrimary},
-    {"code": "CV", "name": "Cape Verde", "value": 500585, "color": colorDanger},
-    {"code": "CF", "name": "Central African Rep.", "value": 4486837, "color": colorDanger},
-    {"code": "TD", "name": "Chad", "value": 11525496, "color": colorDanger},
-    {"code": "CL", "name": "Chile", "value": 17269525, "color": colorSuccess},
-    {"code": "CN", "name": "China", "value": 1347565324, "color": colorPrimaryDark},
-    {"code": "CO", "name": "Colombia", "value": 46927125, "color": colorSuccess},
-    {"code": "KM", "name": "Comoros", "value": 753943, "color": colorDanger},
-    {"code": "CD", "name": "Congo, Dem. Rep.", "value": 67757577, "color": colorDanger},
-    {"code": "CG", "name": "Congo, Rep.", "value": 4139748, "color": colorDanger},
-    {"code": "CR", "name": "Costa Rica", "value": 4726575, "color": colorPrimary},
-    {"code": "CI", "name": "Cote d'Ivoire", "value": 20152894, "color": colorDanger},
-    {"code": "HR", "name": "Croatia", "value": 4395560, "color": colorWarning},
-    {"code": "CU", "name": "Cuba", "value": 11253665, "color": colorPrimary},
-    {"code": "CY", "name": "Cyprus", "value": 1116564, "color": colorWarning},
-    {"code": "CZ", "name": "Czech Rep.", "value": 10534293, "color": colorWarning},
-    {"code": "DK", "name": "Denmark", "value": 5572594, "color": colorWarning},
-    {"code": "DJ", "name": "Djibouti", "value": 905564, "color": colorDanger},
-    {"code": "DO", "name": "Dominican Rep.", "value": 10056181, "color": colorPrimary},
-    {"code": "EC", "name": "Ecuador", "value": 14666055, "color": colorSuccess},
-    {"code": "EG", "name": "Egypt", "value": 82536770, "color": colorDanger},
-    {"code": "SV", "name": "El Salvador", "value": 6227491, "color": colorPrimary},
-    {"code": "GQ", "name": "Equatorial Guinea", "value": 720213, "color": colorDanger},
-    {"code": "ER", "name": "Eritrea", "value": 5415280, "color": colorDanger},
-    {"code": "EE", "name": "Estonia", "value": 1340537, "color": colorWarning},
-    {"code": "ET", "name": "Ethiopia", "value": 84734262, "color": colorDanger},
-    {"code": "FJ", "name": "Fiji", "value": 868406, "color": colorWarningDark},
-    {"code": "FI", "name": "Finland", "value": 5384770, "color": colorWarning},
-    {"code": "FR", "name": "France", "value": 63125894, "color": colorWarning},
-    {"code": "GA", "name": "Gabon", "value": 1534262, "color": colorDanger},
-    {"code": "GM", "name": "Gambia", "value": 1776103, "color": colorDanger},
-    {"code": "GE", "name": "Georgia", "value": 4329026, "color": colorWarning},
-    {"code": "DE", "name": "Germany", "value": 82162512, "color": colorWarning},
-    {"code": "GH", "name": "Ghana", "value": 24965816, "color": colorDanger},
-    {"code": "GR", "name": "Greece", "value": 11390031, "color": colorWarning},
-    {"code": "GT", "name": "Guatemala", "value": 14757316, "color": colorPrimary},
-    {"code": "GN", "name": "Guinea", "value": 10221808, "color": colorDanger},
-    {"code": "GW", "name": "Guinea-Bissau", "value": 1547061, "color": colorDanger},
-    {"code": "GY", "name": "Guyana", "value": 756040, "color": colorSuccess},
-    {"code": "HT", "name": "Haiti", "value": 10123787, "color": colorPrimary},
-    {"code": "HN", "name": "Honduras", "value": 7754687, "color": colorPrimary},
-    {"code": "HK", "name": "Hong Kong, China", "value": 7122187, "color": colorPrimaryDark},
-    {"code": "HU", "name": "Hungary", "value": 9966116, "color": colorWarning},
-    {"code": "IS", "name": "Iceland", "value": 324366, "color": colorWarning},
-    {"code": "IN", "name": "India", "value": 1241491960, "color": colorPrimaryDark},
-    {"code": "ID", "name": "Indonesia", "value": 242325638, "color": colorPrimaryDark},
-    {"code": "IR", "name": "Iran", "value": 74798599, "color": colorPrimaryDark},
-    {"code": "IQ", "name": "Iraq", "value": 32664942, "color": colorPrimaryDark},
-    {"code": "IE", "name": "Ireland", "value": 4525802, "color": colorWarning},
-    {"code": "IL", "name": "Israel", "value": 7562194, "color": colorPrimaryDark},
-    {"code": "IT", "name": "Italy", "value": 60788694, "color": colorWarning},
-    {"code": "JM", "name": "Jamaica", "value": 2751273, "color": colorPrimary},
-    {"code": "JP", "name": "Japan", "value": 126497241, "color": colorPrimaryDark},
-    {"code": "JO", "name": "Jordan", "value": 6330169, "color": colorPrimaryDark},
-    {"code": "KZ", "name": "Kazakhstan", "value": 16206750, "color": colorPrimaryDark},
-    {"code": "KE", "name": "Kenya", "value": 41609728, "color": colorDanger},
-    {"code": "KP", "name": "Korea, Dem. Rep.", "value": 24451285, "color": colorPrimaryDark},
-    {"code": "KR", "name": "Korea, Rep.", "value": 48391343, "color": colorPrimaryDark},
-    {"code": "KW", "name": "Kuwait", "value": 2818042, "color": colorPrimaryDark},
-    {"code": "KG", "name": "Kyrgyzstan", "value": 5392580, "color": colorPrimaryDark},
-    {"code": "LA", "name": "Laos", "value": 6288037, "color": colorPrimaryDark},
-    {"code": "LV", "name": "Latvia", "value": 2243142, "color": colorWarning},
-    {"code": "LB", "name": "Lebanon", "value": 4259405, "color": colorPrimaryDark},
-    {"code": "LS", "name": "Lesotho", "value": 2193843, "color": colorDanger},
-    {"code": "LR", "name": "Liberia", "value": 4128572, "color": colorDanger},
-    {"code": "LY", "name": "Libya", "value": 6422772, "color": colorDanger},
-    {"code": "LT", "name": "Lithuania", "value": 3307481, "color": colorWarning},
-    {"code": "LU", "name": "Luxembourg", "value": 515941, "color": colorWarning},
-    {"code": "MK", "name": "Macedonia, FYR", "value": 2063893, "color": colorWarning},
-    {"code": "MG", "name": "Madagascar", "value": 21315135, "color": colorDanger},
-    {"code": "MW", "name": "Malawi", "value": 15380888, "color": colorDanger},
-    {"code": "MY", "name": "Malaysia", "value": 28859154, "color": colorPrimaryDark},
-    {"code": "ML", "name": "Mali", "value": 15839538, "color": colorDanger},
-    {"code": "MR", "name": "Mauritania", "value": 3541540, "color": colorDanger},
-    {"code": "MU", "name": "Mauritius", "value": 1306593, "color": colorDanger},
-    {"code": "MX", "name": "Mexico", "value": 114793341, "color": colorPrimary},
-    {"code": "MD", "name": "Moldova", "value": 3544864, "color": colorWarning},
-    {"code": "MN", "name": "Mongolia", "value": 2800114, "color": colorPrimaryDark},
-    {"code": "ME", "name": "Montenegro", "value": 632261, "color": colorWarning},
-    {"code": "MA", "name": "Morocco", "value": 32272974, "color": colorDanger},
-    {"code": "MZ", "name": "Mozambique", "value": 23929708, "color": colorDanger},
-    {"code": "MM", "name": "Myanmar", "value": 48336763, "color": colorPrimaryDark},
-    {"code": "NA", "name": "Namibia", "value": 2324004, "color": colorDanger},
-    {"code": "NP", "name": "Nepal", "value": 30485798, "color": colorPrimaryDark},
-    {"code": "NL", "name": "Netherlands", "value": 16664746, "color": colorWarning},
-    {"code": "NZ", "name": "New Zealand", "value": 4414509, "color": colorWarningDark},
-    {"code": "NI", "name": "Nicaragua", "value": 5869859, "color": colorPrimary},
-    {"code": "NE", "name": "Niger", "value": 16068994, "color": colorDanger},
-    {"code": "NG", "name": "Nigeria", "value": 162470737, "color": colorDanger},
-    {"code": "NO", "name": "Norway", "value": 4924848, "color": colorWarning},
-    {"code": "OM", "name": "Oman", "value": 2846145, "color": colorPrimaryDark},
-    {"code": "PK", "name": "Pakistan", "value": 176745364, "color": colorPrimaryDark},
-    {"code": "PA", "name": "Panama", "value": 3571185, "color": colorPrimary},
-    {"code": "PG", "name": "Papua New Guinea", "value": 7013829, "color": colorWarningDark},
-    {"code": "PY", "name": "Paraguay", "value": 6568290, "color": colorSuccess},
-    {"code": "PE", "name": "Peru", "value": 29399817, "color": colorSuccess},
-    {"code": "PH", "name": "Philippines", "value": 94852030, "color": colorPrimaryDark},
-    {"code": "PL", "name": "Poland", "value": 38298949, "color": colorWarning},
-    {"code": "PT", "name": "Portugal", "value": 10689663, "color": colorWarning},
-    {"code": "PR", "name": "Puerto Rico", "value": 3745526, "color": colorPrimary},
-    {"code": "QA", "name": "Qatar", "value": 1870041, "color": colorPrimaryDark},
-    {"code": "RO", "name": "Romania", "value": 21436495, "color": colorWarning},
-    {"code": "RU", "name": "Russia", "value": 142835555, "color": colorWarning},
-    {"code": "RW", "name": "Rwanda", "value": 10942950, "color": colorDanger},
-    {"code": "SA", "name": "Saudi Arabia", "value": 28082541, "color": colorPrimaryDark},
-    {"code": "SN", "name": "Senegal", "value": 12767556, "color": colorDanger},
-    {"code": "RS", "name": "Serbia", "value": 9853969, "color": colorWarning},
-    {"code": "SL", "name": "Sierra Leone", "value": 5997486, "color": colorDanger},
-    {"code": "SG", "name": "Singapore", "value": 5187933, "color": colorPrimaryDark},
-    {"code": "SK", "name": "Slovak Republic", "value": 5471502, "color": colorWarning},
-    {"code": "SI", "name": "Slovenia", "value": 2035012, "color": colorWarning},
-    {"code": "SB", "name": "Solomon Islands", "value": 552267, "color": colorWarningDark},
-    {"code": "SO", "name": "Somalia", "value": 9556873, "color": colorDanger},
-    {"code": "ZA", "name": "South Africa", "value": 50459978, "color": colorDanger},
-    {"code": "ES", "name": "Spain", "value": 46454895, "color": colorWarning},
-    {"code": "LK", "name": "Sri Lanka", "value": 21045394, "color": colorPrimaryDark},
-    {"code": "SD", "name": "Sudan", "value": 34735288, "color": colorDanger},
-    {"code": "SR", "name": "Suriname", "value": 529419, "color": colorSuccess},
-    {"code": "SZ", "name": "Swaziland", "value": 1203330, "color": colorDanger},
-    {"code": "SE", "name": "Sweden", "value": 9440747, "color": colorWarning},
-    {"code": "CH", "name": "Switzerland", "value": 7701690, "color": colorWarning},
-    {"code": "SY", "name": "Syria", "value": 20766037, "color": colorPrimaryDark},
-    {"code": "TW", "name": "Taiwan", "value": 23072000, "color": colorPrimaryDark},
-    {"code": "TJ", "name": "Tajikistan", "value": 6976958, "color": colorPrimaryDark},
-    {"code": "TZ", "name": "Tanzania", "value": 46218486, "color": colorDanger},
-    {"code": "TH", "name": "Thailand", "value": 69518555, "color": colorPrimaryDark},
-    {"code": "TG", "name": "Togo", "value": 6154813, "color": colorDanger},
-    {"code": "TT", "name": "Trinidad and Tobago", "value": 1346350, "color": colorPrimary},
-    {"code": "TN", "name": "Tunisia", "value": 10594057, "color": colorDanger},
-    {"code": "TR", "name": "Turkey", "value": 73639596, "color": colorWarning},
-    {"code": "TM", "name": "Turkmenistan", "value": 5105301, "color": colorPrimaryDark},
-    {"code": "UG", "name": "Uganda", "value": 34509205, "color": colorDanger},
-    {"code": "UA", "name": "Ukraine", "value": 45190180, "color": colorWarning},
-    {"code": "AE", "name": "United Arab Emirates", "value": 7890924, "color": colorPrimaryDark},
-    {"code": "GB", "name": "United Kingdom", "value": 62417431, "color": colorWarning},
-    {"code": "US", "name": "United States", "value": 313085380, "color": colorPrimary},
-    {"code": "UY", "name": "Uruguay", "value": 3380008, "color": colorSuccess},
-    {"code": "UZ", "name": "Uzbekistan", "value": 27760267, "color": colorPrimaryDark},
-    {"code": "VE", "name": "Venezuela", "value": 29436891, "color": colorSuccess},
-    {"code": "PS", "name": "West Bank and Gaza", "value": 4152369, "color": colorPrimaryDark},
-    {"code": "VN", "name": "Vietnam", "value": 88791996, "color": colorPrimaryDark},
-    {"code": "YE", "name": "Yemen, Rep.", "value": 24799880, "color": colorPrimaryDark},
-    {"code": "ZM", "name": "Zambia", "value": 13474959, "color": colorDanger},
-    {"code": "ZW", "name": "Zimbabwe", "value": 12754378, "color": colorDanger}
+    {'code': 'AF', 'name': 'Afghanistan', 'value': 32358260, 'color': colorPrimaryDark},
+    {'code': 'AL', 'name': 'Albania', 'value': 3215988, 'color': colorWarning},
+    {'code': 'DZ', 'name': 'Algeria', 'value': 35980193, 'color': colorDanger},
+    {'code': 'AO', 'name': 'Angola', 'value': 19618432, 'color': colorDanger},
+    {'code': 'AR', 'name': 'Argentina', 'value': 40764561, 'color': colorSuccess},
+    {'code': 'AM', 'name': 'Armenia', 'value': 3100236, 'color': colorWarning},
+    {'code': 'AU', 'name': 'Australia', 'value': 22605732, 'color': colorWarningDark},
+    {'code': 'AT', 'name': 'Austria', 'value': 8413429, 'color': colorWarning},
+    {'code': 'AZ', 'name': 'Azerbaijan', 'value': 9306023, 'color': colorWarning},
+    {'code': 'BH', 'name': 'Bahrain', 'value': 1323535, 'color': colorPrimaryDark},
+    {'code': 'BD', 'name': 'Bangladesh', 'value': 150493658, 'color': colorPrimaryDark},
+    {'code': 'BY', 'name': 'Belarus', 'value': 9559441, 'color': colorWarning},
+    {'code': 'BE', 'name': 'Belgium', 'value': 10754056, 'color': colorWarning},
+    {'code': 'BJ', 'name': 'Benin', 'value': 9099922, 'color': colorDanger},
+    {'code': 'BT', 'name': 'Bhutan', 'value': 738267, 'color': colorPrimaryDark},
+    {'code': 'BO', 'name': 'Bolivia', 'value': 10088108, 'color': colorSuccess},
+    {'code': 'BA', 'name': 'Bosnia and Herzegovina', 'value': 3752228, 'color': colorWarning},
+    {'code': 'BW', 'name': 'Botswana', 'value': 2030738, 'color': colorDanger},
+    {'code': 'BR', 'name': 'Brazil', 'value': 196655014, 'color': colorSuccess},
+    {'code': 'BN', 'name': 'Brunei', 'value': 405938, 'color': colorPrimaryDark},
+    {'code': 'BG', 'name': 'Bulgaria', 'value': 7446135, 'color': colorWarning},
+    {'code': 'BF', 'name': 'Burkina Faso', 'value': 16967845, 'color': colorDanger},
+    {'code': 'BI', 'name': 'Burundi', 'value': 8575172, 'color': colorDanger},
+    {'code': 'KH', 'name': 'Cambodia', 'value': 14305183, 'color': colorPrimaryDark},
+    {'code': 'CM', 'name': 'Cameroon', 'value': 20030362, 'color': colorDanger},
+    {'code': 'CA', 'name': 'Canada', 'value': 34349561, 'color': colorPrimary},
+    {'code': 'CV', 'name': 'Cape Verde', 'value': 500585, 'color': colorDanger},
+    {'code': 'CF', 'name': 'Central African Rep.', 'value': 4486837, 'color': colorDanger},
+    {'code': 'TD', 'name': 'Chad', 'value': 11525496, 'color': colorDanger},
+    {'code': 'CL', 'name': 'Chile', 'value': 17269525, 'color': colorSuccess},
+    {'code': 'CN', 'name': 'China', 'value': 1347565324, 'color': colorPrimaryDark},
+    {'code': 'CO', 'name': 'Colombia', 'value': 46927125, 'color': colorSuccess},
+    {'code': 'KM', 'name': 'Comoros', 'value': 753943, 'color': colorDanger},
+    {'code': 'CD', 'name': 'Congo, Dem. Rep.', 'value': 67757577, 'color': colorDanger},
+    {'code': 'CG', 'name': 'Congo, Rep.', 'value': 4139748, 'color': colorDanger},
+    {'code': 'CR', 'name': 'Costa Rica', 'value': 4726575, 'color': colorPrimary},
+    {'code': 'CI', 'name': 'Cote d\'Ivoire', 'value': 20152894, 'color': colorDanger},
+    {'code': 'HR', 'name': 'Croatia', 'value': 4395560, 'color': colorWarning},
+    {'code': 'CU', 'name': 'Cuba', 'value': 11253665, 'color': colorPrimary},
+    {'code': 'CY', 'name': 'Cyprus', 'value': 1116564, 'color': colorWarning},
+    {'code': 'CZ', 'name': 'Czech Rep.', 'value': 10534293, 'color': colorWarning},
+    {'code': 'DK', 'name': 'Denmark', 'value': 5572594, 'color': colorWarning},
+    {'code': 'DJ', 'name': 'Djibouti', 'value': 905564, 'color': colorDanger},
+    {'code': 'DO', 'name': 'Dominican Rep.', 'value': 10056181, 'color': colorPrimary},
+    {'code': 'EC', 'name': 'Ecuador', 'value': 14666055, 'color': colorSuccess},
+    {'code': 'EG', 'name': 'Egypt', 'value': 82536770, 'color': colorDanger},
+    {'code': 'SV', 'name': 'El Salvador', 'value': 6227491, 'color': colorPrimary},
+    {'code': 'GQ', 'name': 'Equatorial Guinea', 'value': 720213, 'color': colorDanger},
+    {'code': 'ER', 'name': 'Eritrea', 'value': 5415280, 'color': colorDanger},
+    {'code': 'EE', 'name': 'Estonia', 'value': 1340537, 'color': colorWarning},
+    {'code': 'ET', 'name': 'Ethiopia', 'value': 84734262, 'color': colorDanger},
+    {'code': 'FJ', 'name': 'Fiji', 'value': 868406, 'color': colorWarningDark},
+    {'code': 'FI', 'name': 'Finland', 'value': 5384770, 'color': colorWarning},
+    {'code': 'FR', 'name': 'France', 'value': 63125894, 'color': colorWarning},
+    {'code': 'GA', 'name': 'Gabon', 'value': 1534262, 'color': colorDanger},
+    {'code': 'GM', 'name': 'Gambia', 'value': 1776103, 'color': colorDanger},
+    {'code': 'GE', 'name': 'Georgia', 'value': 4329026, 'color': colorWarning},
+    {'code': 'DE', 'name': 'Germany', 'value': 82162512, 'color': colorWarning},
+    {'code': 'GH', 'name': 'Ghana', 'value': 24965816, 'color': colorDanger},
+    {'code': 'GR', 'name': 'Greece', 'value': 11390031, 'color': colorWarning},
+    {'code': 'GT', 'name': 'Guatemala', 'value': 14757316, 'color': colorPrimary},
+    {'code': 'GN', 'name': 'Guinea', 'value': 10221808, 'color': colorDanger},
+    {'code': 'GW', 'name': 'Guinea-Bissau', 'value': 1547061, 'color': colorDanger},
+    {'code': 'GY', 'name': 'Guyana', 'value': 756040, 'color': colorSuccess},
+    {'code': 'HT', 'name': 'Haiti', 'value': 10123787, 'color': colorPrimary},
+    {'code': 'HN', 'name': 'Honduras', 'value': 7754687, 'color': colorPrimary},
+    {'code': 'HK', 'name': 'Hong Kong, China', 'value': 7122187, 'color': colorPrimaryDark},
+    {'code': 'HU', 'name': 'Hungary', 'value': 9966116, 'color': colorWarning},
+    {'code': 'IS', 'name': 'Iceland', 'value': 324366, 'color': colorWarning},
+    {'code': 'IN', 'name': 'India', 'value': 1241491960, 'color': colorPrimaryDark},
+    {'code': 'ID', 'name': 'Indonesia', 'value': 242325638, 'color': colorPrimaryDark},
+    {'code': 'IR', 'name': 'Iran', 'value': 74798599, 'color': colorPrimaryDark},
+    {'code': 'IQ', 'name': 'Iraq', 'value': 32664942, 'color': colorPrimaryDark},
+    {'code': 'IE', 'name': 'Ireland', 'value': 4525802, 'color': colorWarning},
+    {'code': 'IL', 'name': 'Israel', 'value': 7562194, 'color': colorPrimaryDark},
+    {'code': 'IT', 'name': 'Italy', 'value': 60788694, 'color': colorWarning},
+    {'code': 'JM', 'name': 'Jamaica', 'value': 2751273, 'color': colorPrimary},
+    {'code': 'JP', 'name': 'Japan', 'value': 126497241, 'color': colorPrimaryDark},
+    {'code': 'JO', 'name': 'Jordan', 'value': 6330169, 'color': colorPrimaryDark},
+    {'code': 'KZ', 'name': 'Kazakhstan', 'value': 16206750, 'color': colorPrimaryDark},
+    {'code': 'KE', 'name': 'Kenya', 'value': 41609728, 'color': colorDanger},
+    {'code': 'KP', 'name': 'Korea, Dem. Rep.', 'value': 24451285, 'color': colorPrimaryDark},
+    {'code': 'KR', 'name': 'Korea, Rep.', 'value': 48391343, 'color': colorPrimaryDark},
+    {'code': 'KW', 'name': 'Kuwait', 'value': 2818042, 'color': colorPrimaryDark},
+    {'code': 'KG', 'name': 'Kyrgyzstan', 'value': 5392580, 'color': colorPrimaryDark},
+    {'code': 'LA', 'name': 'Laos', 'value': 6288037, 'color': colorPrimaryDark},
+    {'code': 'LV', 'name': 'Latvia', 'value': 2243142, 'color': colorWarning},
+    {'code': 'LB', 'name': 'Lebanon', 'value': 4259405, 'color': colorPrimaryDark},
+    {'code': 'LS', 'name': 'Lesotho', 'value': 2193843, 'color': colorDanger},
+    {'code': 'LR', 'name': 'Liberia', 'value': 4128572, 'color': colorDanger},
+    {'code': 'LY', 'name': 'Libya', 'value': 6422772, 'color': colorDanger},
+    {'code': 'LT', 'name': 'Lithuania', 'value': 3307481, 'color': colorWarning},
+    {'code': 'LU', 'name': 'Luxembourg', 'value': 515941, 'color': colorWarning},
+    {'code': 'MK', 'name': 'Macedonia, FYR', 'value': 2063893, 'color': colorWarning},
+    {'code': 'MG', 'name': 'Madagascar', 'value': 21315135, 'color': colorDanger},
+    {'code': 'MW', 'name': 'Malawi', 'value': 15380888, 'color': colorDanger},
+    {'code': 'MY', 'name': 'Malaysia', 'value': 28859154, 'color': colorPrimaryDark},
+    {'code': 'ML', 'name': 'Mali', 'value': 15839538, 'color': colorDanger},
+    {'code': 'MR', 'name': 'Mauritania', 'value': 3541540, 'color': colorDanger},
+    {'code': 'MU', 'name': 'Mauritius', 'value': 1306593, 'color': colorDanger},
+    {'code': 'MX', 'name': 'Mexico', 'value': 114793341, 'color': colorPrimary},
+    {'code': 'MD', 'name': 'Moldova', 'value': 3544864, 'color': colorWarning},
+    {'code': 'MN', 'name': 'Mongolia', 'value': 2800114, 'color': colorPrimaryDark},
+    {'code': 'ME', 'name': 'Montenegro', 'value': 632261, 'color': colorWarning},
+    {'code': 'MA', 'name': 'Morocco', 'value': 32272974, 'color': colorDanger},
+    {'code': 'MZ', 'name': 'Mozambique', 'value': 23929708, 'color': colorDanger},
+    {'code': 'MM', 'name': 'Myanmar', 'value': 48336763, 'color': colorPrimaryDark},
+    {'code': 'NA', 'name': 'Namibia', 'value': 2324004, 'color': colorDanger},
+    {'code': 'NP', 'name': 'Nepal', 'value': 30485798, 'color': colorPrimaryDark},
+    {'code': 'NL', 'name': 'Netherlands', 'value': 16664746, 'color': colorWarning},
+    {'code': 'NZ', 'name': 'New Zealand', 'value': 4414509, 'color': colorWarningDark},
+    {'code': 'NI', 'name': 'Nicaragua', 'value': 5869859, 'color': colorPrimary},
+    {'code': 'NE', 'name': 'Niger', 'value': 16068994, 'color': colorDanger},
+    {'code': 'NG', 'name': 'Nigeria', 'value': 162470737, 'color': colorDanger},
+    {'code': 'NO', 'name': 'Norway', 'value': 4924848, 'color': colorWarning},
+    {'code': 'OM', 'name': 'Oman', 'value': 2846145, 'color': colorPrimaryDark},
+    {'code': 'PK', 'name': 'Pakistan', 'value': 176745364, 'color': colorPrimaryDark},
+    {'code': 'PA', 'name': 'Panama', 'value': 3571185, 'color': colorPrimary},
+    {'code': 'PG', 'name': 'Papua New Guinea', 'value': 7013829, 'color': colorWarningDark},
+    {'code': 'PY', 'name': 'Paraguay', 'value': 6568290, 'color': colorSuccess},
+    {'code': 'PE', 'name': 'Peru', 'value': 29399817, 'color': colorSuccess},
+    {'code': 'PH', 'name': 'Philippines', 'value': 94852030, 'color': colorPrimaryDark},
+    {'code': 'PL', 'name': 'Poland', 'value': 38298949, 'color': colorWarning},
+    {'code': 'PT', 'name': 'Portugal', 'value': 10689663, 'color': colorWarning},
+    {'code': 'PR', 'name': 'Puerto Rico', 'value': 3745526, 'color': colorPrimary},
+    {'code': 'QA', 'name': 'Qatar', 'value': 1870041, 'color': colorPrimaryDark},
+    {'code': 'RO', 'name': 'Romania', 'value': 21436495, 'color': colorWarning},
+    {'code': 'RU', 'name': 'Russia', 'value': 142835555, 'color': colorWarning},
+    {'code': 'RW', 'name': 'Rwanda', 'value': 10942950, 'color': colorDanger},
+    {'code': 'SA', 'name': 'Saudi Arabia', 'value': 28082541, 'color': colorPrimaryDark},
+    {'code': 'SN', 'name': 'Senegal', 'value': 12767556, 'color': colorDanger},
+    {'code': 'RS', 'name': 'Serbia', 'value': 9853969, 'color': colorWarning},
+    {'code': 'SL', 'name': 'Sierra Leone', 'value': 5997486, 'color': colorDanger},
+    {'code': 'SG', 'name': 'Singapore', 'value': 5187933, 'color': colorPrimaryDark},
+    {'code': 'SK', 'name': 'Slovak Republic', 'value': 5471502, 'color': colorWarning},
+    {'code': 'SI', 'name': 'Slovenia', 'value': 2035012, 'color': colorWarning},
+    {'code': 'SB', 'name': 'Solomon Islands', 'value': 552267, 'color': colorWarningDark},
+    {'code': 'SO', 'name': 'Somalia', 'value': 9556873, 'color': colorDanger},
+    {'code': 'ZA', 'name': 'South Africa', 'value': 50459978, 'color': colorDanger},
+    {'code': 'ES', 'name': 'Spain', 'value': 46454895, 'color': colorWarning},
+    {'code': 'LK', 'name': 'Sri Lanka', 'value': 21045394, 'color': colorPrimaryDark},
+    {'code': 'SD', 'name': 'Sudan', 'value': 34735288, 'color': colorDanger},
+    {'code': 'SR', 'name': 'Suriname', 'value': 529419, 'color': colorSuccess},
+    {'code': 'SZ', 'name': 'Swaziland', 'value': 1203330, 'color': colorDanger},
+    {'code': 'SE', 'name': 'Sweden', 'value': 9440747, 'color': colorWarning},
+    {'code': 'CH', 'name': 'Switzerland', 'value': 7701690, 'color': colorWarning},
+    {'code': 'SY', 'name': 'Syria', 'value': 20766037, 'color': colorPrimaryDark},
+    {'code': 'TW', 'name': 'Taiwan', 'value': 23072000, 'color': colorPrimaryDark},
+    {'code': 'TJ', 'name': 'Tajikistan', 'value': 6976958, 'color': colorPrimaryDark},
+    {'code': 'TZ', 'name': 'Tanzania', 'value': 46218486, 'color': colorDanger},
+    {'code': 'TH', 'name': 'Thailand', 'value': 69518555, 'color': colorPrimaryDark},
+    {'code': 'TG', 'name': 'Togo', 'value': 6154813, 'color': colorDanger},
+    {'code': 'TT', 'name': 'Trinidad and Tobago', 'value': 1346350, 'color': colorPrimary},
+    {'code': 'TN', 'name': 'Tunisia', 'value': 10594057, 'color': colorDanger},
+    {'code': 'TR', 'name': 'Turkey', 'value': 73639596, 'color': colorWarning},
+    {'code': 'TM', 'name': 'Turkmenistan', 'value': 5105301, 'color': colorPrimaryDark},
+    {'code': 'UG', 'name': 'Uganda', 'value': 34509205, 'color': colorDanger},
+    {'code': 'UA', 'name': 'Ukraine', 'value': 45190180, 'color': colorWarning},
+    {'code': 'AE', 'name': 'United Arab Emirates', 'value': 7890924, 'color': colorPrimaryDark},
+    {'code': 'GB', 'name': 'United Kingdom', 'value': 62417431, 'color': colorWarning},
+    {'code': 'US', 'name': 'United States', 'value': 313085380, 'color': colorPrimary},
+    {'code': 'UY', 'name': 'Uruguay', 'value': 3380008, 'color': colorSuccess},
+    {'code': 'UZ', 'name': 'Uzbekistan', 'value': 27760267, 'color': colorPrimaryDark},
+    {'code': 'VE', 'name': 'Venezuela', 'value': 29436891, 'color': colorSuccess},
+    {'code': 'PS', 'name': 'West Bank and Gaza', 'value': 4152369, 'color': colorPrimaryDark},
+    {'code': 'VN', 'name': 'Vietnam', 'value': 88791996, 'color': colorPrimaryDark},
+    {'code': 'YE', 'name': 'Yemen, Rep.', 'value': 24799880, 'color': colorPrimaryDark},
+    {'code': 'ZM', 'name': 'Zambia', 'value': 13474959, 'color': colorDanger},
+    {'code': 'ZW', 'name': 'Zimbabwe', 'value': 12754378, 'color': colorDanger}
   ];
 
   var map;
@@ -437,14 +437,14 @@ blurAdminApp.controller('mapBubblesCtrl', [function () {
   AmCharts.theme = AmCharts.themes.blur;
   map = new AmCharts.AmMap();
 
-  map.addTitle("Population of the World in 2011", 14);
-  map.addTitle("source: Gapminder", 11);
+  map.addTitle('Population of the World in 2011', 14);
+  map.addTitle('source: Gapminder', 11);
   map.areasSettings = {
-    unlistedAreasColor: "#000000",
+    unlistedAreasColor: '#000000',
     unlistedAreasAlpha: 0.1
   };
-  map.imagesSettings.balloonText = "<span style='font-size:14px;'><b>[[title]]</b>: [[value]]</span>";
-  map.pathToImages = "release/img/";
+  map.imagesSettings.balloonText = '<span style="font-size:14px;"><b>[[title]]</b>: [[value]]</span>';
+  map.pathToImages = 'img/';
 
   var dataProvider = {
     mapVar: AmCharts.maps.worldLow,
@@ -468,7 +468,7 @@ blurAdminApp.controller('mapBubblesCtrl', [function () {
     var id = dataItem.code;
 
     dataProvider.images.push({
-      type: "circle",
+      type: 'circle',
       width: size,
       height: size,
       color: dataItem.color,
@@ -484,5 +484,5 @@ blurAdminApp.controller('mapBubblesCtrl', [function () {
     enabled: true
   };
 
-  map.write("map-bubbles");
+  map.write('map-bubbles');
 }]);
\ No newline at end of file
diff --git a/src/app/pages/maps/widgets/map-lines/map-lines.js b/src/app/pages/maps/widgets/map-lines/map-lines.js
index 96c27c0..a7f74fa 100644
--- a/src/app/pages/maps/widgets/map-lines/map-lines.js
+++ b/src/app/pages/maps/widgets/map-lines/map-lines.js
@@ -2,21 +2,21 @@
 
 blurAdminApp.controller('mapLinesCtrl', [function () {
 // svg path for target icon
-  var targetSVG = "M9,0C4.029,0,0,4.029,0,9s4.029,9,9,9s9-4.029,9-9S13.971,0,9,0z M9,15.93 c-3.83,0-6.93-3.1-6.93-6.93S5.17,2.07,9,2.07s6.93,3.1,6.93,6.93S12.83,15.93,9,15.93 M12.5,9c0,1.933-1.567,3.5-3.5,3.5S5.5,10.933,5.5,9S7.067,5.5,9,5.5 S12.5,7.067,12.5,9z";
+  var targetSVG = 'M9,0C4.029,0,0,4.029,0,9s4.029,9,9,9s9-4.029,9-9S13.971,0,9,0z M9,15.93 c-3.83,0-6.93-3.1-6.93-6.93S5.17,2.07,9,2.07s6.93,3.1,6.93,6.93S12.83,15.93,9,15.93 M12.5,9c0,1.933-1.567,3.5-3.5,3.5S5.5,10.933,5.5,9S7.067,5.5,9,5.5 S12.5,7.067,12.5,9z';
 // svg path for plane icon
-  var planeSVG = "M19.671,8.11l-2.777,2.777l-3.837-0.861c0.362-0.505,0.916-1.683,0.464-2.135c-0.518-0.517-1.979,0.278-2.305,0.604l-0.913,0.913L7.614,8.804l-2.021,2.021l2.232,1.061l-0.082,0.082l1.701,1.701l0.688-0.687l3.164,1.504L9.571,18.21H6.413l-1.137,1.138l3.6,0.948l1.83,1.83l0.947,3.598l1.137-1.137V21.43l3.725-3.725l1.504,3.164l-0.687,0.687l1.702,1.701l0.081-0.081l1.062,2.231l2.02-2.02l-0.604-2.689l0.912-0.912c0.326-0.326,1.121-1.789,0.604-2.306c-0.452-0.452-1.63,0.101-2.135,0.464l-0.861-3.838l2.777-2.777c0.947-0.947,3.599-4.862,2.62-5.839C24.533,4.512,20.618,7.163,19.671,8.11z";
+  var planeSVG = 'M19.671,8.11l-2.777,2.777l-3.837-0.861c0.362-0.505,0.916-1.683,0.464-2.135c-0.518-0.517-1.979,0.278-2.305,0.604l-0.913,0.913L7.614,8.804l-2.021,2.021l2.232,1.061l-0.082,0.082l1.701,1.701l0.688-0.687l3.164,1.504L9.571,18.21H6.413l-1.137,1.138l3.6,0.948l1.83,1.83l0.947,3.598l1.137-1.137V21.43l3.725-3.725l1.504,3.164l-0.687,0.687l1.702,1.701l0.081-0.081l1.062,2.231l2.02-2.02l-0.604-2.689l0.912-0.912c0.326-0.326,1.121-1.789,0.604-2.306c-0.452-0.452-1.63,0.101-2.135,0.464l-0.861-3.838l2.777-2.777c0.947-0.947,3.599-4.862,2.62-5.839C24.533,4.512,20.618,7.163,19.671,8.11z';
 
-  var map = AmCharts.makeChart( "map-lines", {
-    type: "map",
-    "theme": "blur",
+  var map = AmCharts.makeChart( 'map-lines', {
+    type: 'map',
+    theme: 'blur',
     dataProvider: {
-      map: "worldLow",
-      linkToObject: "london",
+      map: 'worldLow',
+      linkToObject: 'london',
       images: [ {
-        id: "london",
+        id: 'london',
         color: colorPrimaryDark,
         svgPath: targetSVG,
-        title: "London",
+        title: 'London',
         latitude: 51.5002,
         longitude: -0.1262,
         scale: 1.5,
@@ -63,7 +63,7 @@ blurAdminApp.controller('mapLinesCtrl', [function () {
         } ],
 
         images: [ {
-          label: "Flights from London",
+          label: 'Flights from London',
           svgPath: planeSVG,
           left: 100,
           top: 45,
@@ -73,21 +73,21 @@ blurAdminApp.controller('mapLinesCtrl', [function () {
           labelRollOverColor: colorDanger,
           labelFontSize: 20
         }, {
-          label: "show flights from Vilnius",
+          label: 'show flights from Vilnius',
           left: 106,
           top: 70,
           labelColor: colorPrimaryDark,
           labelRollOverColor: colorDanger,
           labelFontSize: 11,
-          linkToObject: "vilnius"
+          linkToObject: 'vilnius'
         } ]
       },
 
         {
-          id: "vilnius",
+          id: 'vilnius',
           color: colorPrimaryDark,
           svgPath: targetSVG,
-          title: "Vilnius",
+          title: 'Vilnius',
           latitude: 54.6896,
           longitude: 25.2799,
           scale: 1.5,
@@ -131,7 +131,7 @@ blurAdminApp.controller('mapLinesCtrl', [function () {
           } ],
 
           images: [ {
-            label: "Flights from Vilnius",
+            label: 'Flights from Vilnius',
             svgPath: planeSVG,
             left: 100,
             top: 45,
@@ -141,97 +141,97 @@ blurAdminApp.controller('mapLinesCtrl', [function () {
             labelRollOverColor: colorDanger,
             labelFontSize: 20
           }, {
-            label: "show flights from London",
+            label: 'show flights from London',
             left: 106,
             top: 70,
             labelColor: colorPrimaryDark,
             labelRollOverColor: colorDanger,
             labelFontSize: 11,
-            linkToObject: "london"
+            linkToObject: 'london'
           } ]
         }, {
           svgPath: targetSVG,
-          title: "Brussels",
+          title: 'Brussels',
           latitude: 50.8371,
           longitude: 4.3676
         }, {
           svgPath: targetSVG,
-          title: "Prague",
+          title: 'Prague',
           latitude: 50.0878,
           longitude: 14.4205
         }, {
           svgPath: targetSVG,
-          title: "Athens",
+          title: 'Athens',
           latitude: 37.9792,
           longitude: 23.7166
         }, {
           svgPath: targetSVG,
-          title: "Reykjavik",
+          title: 'Reykjavik',
           latitude: 64.1353,
           longitude: -21.8952
         }, {
           svgPath: targetSVG,
-          title: "Dublin",
+          title: 'Dublin',
           latitude: 53.3441,
           longitude: -6.2675
         }, {
           svgPath: targetSVG,
-          title: "Oslo",
+          title: 'Oslo',
           latitude: 59.9138,
           longitude: 10.7387
         }, {
           svgPath: targetSVG,
-          title: "Lisbon",
+          title: 'Lisbon',
           latitude: 38.7072,
           longitude: -9.1355
         }, {
           svgPath: targetSVG,
-          title: "Moscow",
+          title: 'Moscow',
           latitude: 55.7558,
           longitude: 37.6176
         }, {
           svgPath: targetSVG,
-          title: "Belgrade",
+          title: 'Belgrade',
           latitude: 44.8048,
           longitude: 20.4781
         }, {
           svgPath: targetSVG,
-          title: "Bratislava",
+          title: 'Bratislava',
           latitude: 48.2116,
           longitude: 17.1547
         }, {
           svgPath: targetSVG,
-          title: "Ljubljana",
+          title: 'Ljubljana',
           latitude: 46.0514,
           longitude: 14.5060
         }, {
           svgPath: targetSVG,
-          title: "Madrid",
+          title: 'Madrid',
           latitude: 40.4167,
           longitude: -3.7033
         }, {
           svgPath: targetSVG,
-          title: "Stockholm",
+          title: 'Stockholm',
           latitude: 59.3328,
           longitude: 18.0645
         }, {
           svgPath: targetSVG,
-          title: "Bern",
+          title: 'Bern',
           latitude: 46.9480,
           longitude: 7.4481
         }, {
           svgPath: targetSVG,
-          title: "Kiev",
+          title: 'Kiev',
           latitude: 50.4422,
           longitude: 30.5367
         }, {
           svgPath: targetSVG,
-          title: "Paris",
+          title: 'Paris',
           latitude: 48.8567,
           longitude: 2.3510
         }, {
           svgPath: targetSVG,
-          title: "New York",
+          title: 'New York',
           latitude: 40.43,
           longitude: -74
         }
@@ -257,9 +257,9 @@ blurAdminApp.controller('mapLinesCtrl', [function () {
     backgroundZoomsToTop: true,
     linesAboveImages: true,
 
-    "export": {
-      "enabled": true
+    export: {
+      'enabled': true
     },
-    "pathToImages": 'release/img/'
+    pathToImages: 'img/'
   } );
 }]);
\ No newline at end of file
diff --git a/src/app/pages/modals/modals.js b/src/app/pages/modals/modals.js
index 43a3b7f..bcbb5f3 100644
--- a/src/app/pages/modals/modals.js
+++ b/src/app/pages/modals/modals.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.modalsPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/modals', {
-        templateUrl: '/app/pages/modals/modals.html',
+        templateUrl: 'app/pages/modals/modals.html',
         controller: 'modalsPageCtrl'
       });
     }])
@@ -15,8 +15,8 @@ angular.module('BlurAdmin.modalsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Modals",
-                url: "/app/pages/modals/widgets/modals.html"
+                title: 'Modals',
+                url: 'app/pages/modals/widgets/modals.html'
               }
             ]
           ]
@@ -25,14 +25,14 @@ angular.module('BlurAdmin.modalsPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Message Modals",
-                url: "/app/pages/modals/widgets/message-modals.html"
+                title: 'Message Modals',
+                url: 'app/pages/modals/widgets/message-modals.html'
               }
             ],
             [
               {
-                title: "Notifications",
-                url: "/app/pages/modals/widgets/notifications/notifications.html"
+                title: 'Notifications',
+                url: 'app/pages/modals/widgets/notifications/notifications.html'
               }
             ]
           ]
diff --git a/src/app/pages/modals/widgets/notifications/notifications.js b/src/app/pages/modals/widgets/notifications/notifications.js
index 286e4a6..e4771ba 100644
--- a/src/app/pages/modals/widgets/notifications/notifications.js
+++ b/src/app/pages/modals/widgets/notifications/notifications.js
@@ -1,6 +1,6 @@
 'use strict';
 
-blurAdminApp.controller('notificationsCtrl', ["$scope", "toastr", function ($scope, toastr) {
+blurAdminApp.controller('notificationsCtrl', ['$scope', 'toastr', function ($scope, toastr) {
 
   $scope.showSuccessMsg = function() {
     toastr.success('Your information has been saved successfully!');
diff --git a/src/app/pages/profile/profile.js b/src/app/pages/profile/profile.js
index 8f1b35d..d9abcf7 100644
--- a/src/app/pages/profile/profile.js
+++ b/src/app/pages/profile/profile.js
@@ -4,15 +4,15 @@ angular.module('BlurAdmin.profilePage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/profile', {
-        templateUrl: '/app/pages/profile/profile.html',
+        templateUrl: 'app/pages/profile/profile.html',
         controller: 'profilePageCtrl'
       });
     }])
     .controller('profilePageCtrl', ['$scope', 'fileReader', function ($scope, fileReader) {
-      $scope.picture = "release/img/pic-profile.png";
+      $scope.picture = 'img/pic-profile.png';
 
       $scope.removePicture = function () {
-        $scope.picture = "release/img/no-photo.png";
+        $scope.picture = 'img/no-photo.png';
         $scope.noPicture = true;
       };
 
@@ -24,39 +24,39 @@ angular.module('BlurAdmin.profilePage', ['ngRoute'])
 
       $scope.socialProfiles = [
         {
-          name: "Facebook",
-          href: "https://www.facebook.com/nasta.kartul",
-          icon: "socicon-facebook"
+          name: 'Facebook',
+          href: 'https://www.facebook.com/nasta.kartul',
+          icon: 'socicon-facebook'
         },
         {
-          name: "Twitter",
-          icon: "socicon-twitter"
+          name: 'Twitter',
+          icon: 'socicon-twitter'
         },
         {
-          name: "Google",
-          icon: "socicon-google"
+          name: 'Google',
+          icon: 'socicon-google'
         },
         {
-          name: "LinkedIn",
-          href: "https://www.linkedin.com/profile/view?id=177497038",
-          icon: "socicon-linkedin"
+          name: 'LinkedIn',
+          href: 'https://www.linkedin.com/profile/view?id=177497038',
+          icon: 'socicon-linkedin'
         },
         {
-          name: "GitHub",
-          href: "https://github.com/1itvinka",
-          icon: "socicon-github"
+          name: 'GitHub',
+          href: 'https://github.com/1itvinka',
+          icon: 'socicon-github'
         },
         {
-          name: "StackOverflow",
-          icon: "socicon-stackoverflow"
+          name: 'StackOverflow',
+          icon: 'socicon-stackoverflow'
         },
         {
-          name: "Dribbble",
-          icon: "socicon-dribble"
+          name: 'Dribbble',
+          icon: 'socicon-dribble'
         },
         {
-          name: "Behance",
-          icon: "socicon-behace"
+          name: 'Behance',
+          icon: 'socicon-behace'
         }
       ];
 
diff --git a/src/app/pages/profile/profileModal/profileModal.js b/src/app/pages/profile/profileModal/profileModal.js
index 1a606c8..0f22577 100644
--- a/src/app/pages/profile/profileModal/profileModal.js
+++ b/src/app/pages/profile/profileModal/profileModal.js
@@ -6,6 +6,6 @@ blurAdminApp.directive('profileModal', [function () {
     replace: true,
     link: function (scope, elem, attr) {
     },
-    templateUrl: '/app/pages/profile/profileModal/profileModal.html'
+    templateUrl: 'app/pages/profile/profileModal/profileModal.html'
   };
 }]);
\ No newline at end of file
diff --git a/src/app/pages/tables/tables.js b/src/app/pages/tables/tables.js
index b6e26d6..99bee60 100644
--- a/src/app/pages/tables/tables.js
+++ b/src/app/pages/tables/tables.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.tablesPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/tables', {
-        templateUrl: '/app/pages/tables/tables.html',
+        templateUrl: 'app/pages/tables/tables.html',
         controller: 'tablesPageCtrl'
       });
     }])
@@ -14,8 +14,8 @@ angular.module('BlurAdmin.tablesPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Basic Table",
-                url: "/app/pages/tables/widgets/basicTable.html"
+                title: 'Basic Table',
+                url: 'app/pages/tables/widgets/basicTable.html'
               }
             ]
           ]
@@ -24,22 +24,22 @@ angular.module('BlurAdmin.tablesPage', ['ngRoute'])
           widgets: [
             [
               {
-                title: "Striped Rows",
-                url: "/app/pages/tables/widgets/stripedRows.html"
+                title: 'Striped Rows',
+                url: 'app/pages/tables/widgets/stripedRows.html'
               },
               {
-                title: "Bordered table",
-                url: "/app/pages/tables/widgets/borderedTable.html"
+                title: 'Bordered table',
+                url: 'app/pages/tables/widgets/borderedTable.html'
               }
             ],
             [
               {
-                title: "Hover rows",
-                url: "/app/pages/tables/widgets/hoverRows.html"
+                title: 'Hover rows',
+                url: 'app/pages/tables/widgets/hoverRows.html'
               },
               {
-                title: "Condensed table",
-                url: "/app/pages/tables/widgets/condensedTable.html"
+                title: 'Condensed table',
+                url: 'app/pages/tables/widgets/condensedTable.html'
               }
             ]
           ]
diff --git a/src/app/pages/tables/widgets/basicTable.html b/src/app/pages/tables/widgets/basicTable.html
index 035efd4..73a6180 100644
--- a/src/app/pages/tables/widgets/basicTable.html
+++ b/src/app/pages/tables/widgets/basicTable.html
@@ -22,7 +22,7 @@
     </thead>
     <tbody>
     <tr>
-      <td><img src="release/img/chrome.svg" width="20" height="20"></td>
+      <td><img src="img/chrome.svg" width="20" height="20"></td>
       <td class="nowrap">Google Chrome</td>
       <td class="align-right">10,392</td>
       <td class="table-arr"><i class="icon-up"></i></td>
@@ -40,7 +40,7 @@
       <td class="table-arr"><i class="icon-up"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/firefox.svg" width="20" height="20"></td>
+      <td><img src="img/firefox.svg" width="20" height="20"></td>
       <td class="nowrap">Mozilla Firefox</td>
       <td class="align-right">7,873</td>
       <td class="table-arr"><i class="icon-down"></i></td>
@@ -58,7 +58,7 @@
       <td class="table-arr"><i class="icon-up"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/ie.svg" width="20" height="20"></td>
+      <td><img src="img/ie.svg" width="20" height="20"></td>
       <td class="nowrap">Internet Explorer</td>
       <td class="align-right">5,890</td>
       <td class="table-arr"><i class="icon-down"></i></td>
@@ -76,7 +76,7 @@
       <td class="table-arr"><i class="icon-down"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/safari.svg" width="20" height="20"></td>
+      <td><img src="img/safari.svg" width="20" height="20"></td>
       <td class="nowrap">Safari</td>
       <td class="align-right">4,001</td>
       <td class="table-arr"><i class="icon-up"></i></td>
@@ -94,7 +94,7 @@
       <td class="table-arr"><i class="icon-down"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/opera.svg" width="20" height="20"></td>
+      <td><img src="img/opera.svg" width="20" height="20"></td>
       <td class="nowrap">Opera</td>
       <td class="align-right">1,833</td>
       <td class="table-arr"><i class="icon-up"></i></td>
diff --git a/src/app/pages/tables/widgets/borderedTable.html b/src/app/pages/tables/widgets/borderedTable.html
index 58112c3..5afeea6 100644
--- a/src/app/pages/tables/widgets/borderedTable.html
+++ b/src/app/pages/tables/widgets/borderedTable.html
@@ -11,35 +11,35 @@
     </thead>
     <tbody>
     <tr>
-      <td><img src="release/img/chrome.svg" width="20" height="20"></td>
+      <td><img src="img/chrome.svg" width="20" height="20"></td>
       <td ng-class="nowrap">Google Chrome</td>
       <td class="align-right">10,392</td>
       <td class="align-right">4,214</td>
       <td class="align-right">45%</td>
     </tr>
     <tr>
-      <td><img src="release/img/firefox.svg" width="20" height="20"></td>
+      <td><img src="img/firefox.svg" width="20" height="20"></td>
       <td>Mozilla Firefox</td>
       <td class="align-right">7,873</td>
       <td class="align-right">3,031</td>
       <td class="align-right">28%</td>
     </tr>
     <tr>
-      <td><img src="release/img/ie.svg" width="20" height="20"></td>
+      <td><img src="img/ie.svg" width="20" height="20"></td>
       <td ng-class="nowrap">Internet Explorer</td>
       <td class="align-right">5,890</td>
       <td class="align-right">2,102</td>
       <td class="align-right">17%</td>
     </tr>
     <tr>
-      <td><img src="release/img/safari.svg" width="20" height="20"></td>
+      <td><img src="img/safari.svg" width="20" height="20"></td>
       <td ng-class="nowrap">Safari</td>
       <td class="align-right">4,001</td>
       <td class="align-right">1,001</td>
       <td class="align-right">14%</td>
     </tr>
     <tr>
-      <td><img src="release/img/opera.svg" width="20" height="20"></td>
+      <td><img src="img/opera.svg" width="20" height="20"></td>
       <td ng-class="nowrap">Opera</td>
       <td class="align-right">1,833</td>
       <td class="align-right">83</td>
diff --git a/src/app/pages/tables/widgets/hoverRows.html b/src/app/pages/tables/widgets/hoverRows.html
index bd153ba..1d7e4dc 100644
--- a/src/app/pages/tables/widgets/hoverRows.html
+++ b/src/app/pages/tables/widgets/hoverRows.html
@@ -14,7 +14,7 @@
     </thead>
     <tbody>
     <tr>
-      <td><img src="release/img/chrome.svg" width="20" height="20"></td>
+      <td><img src="img/chrome.svg" width="20" height="20"></td>
       <td class="nowrap">Google Chrome</td>
       <td class="align-right">10,392</td>
       <td class="table-arr"><i class="icon-up"></i></td>
@@ -24,7 +24,7 @@
       <td class="table-arr"><i class="icon-up"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/firefox.svg" width="20" height="20"></td>
+      <td><img src="img/firefox.svg" width="20" height="20"></td>
       <td class="nowrap">Mozilla Firefox</td>
       <td class="align-right">7,873</td>
       <td class="table-arr"><i class="icon-down"></i></td>
@@ -34,7 +34,7 @@
       <td class="table-arr"><i class="icon-up"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/ie.svg" width="20" height="20"></td>
+      <td><img src="img/ie.svg" width="20" height="20"></td>
       <td class="nowrap">Internet Explorer</td>
       <td class="align-right">5,890</td>
       <td class="table-arr"><i class="icon-down"></i></td>
@@ -44,7 +44,7 @@
       <td class="table-arr"><i class="icon-down"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/safari.svg" width="20" height="20"></td>
+      <td><img src="img/safari.svg" width="20" height="20"></td>
       <td class="nowrap">Safari</td>
       <td class="align-right">4,001</td>
       <td class="table-arr"><i class="icon-up"></i></td>
@@ -54,7 +54,7 @@
       <td class="table-arr"><i class="icon-down"></i></td>
     </tr>
     <tr>
-      <td><img src="release/img/opera.svg" width="20" height="20"></td>
+      <td><img src="img/opera.svg" width="20" height="20"></td>
       <td class="nowrap">Opera</td>
       <td class="align-right">1,833</td>
       <td class="table-arr"><i class="icon-up"></i></td>
diff --git a/src/app/pages/typography/typography.html b/src/app/pages/typography/typography.html
index 3964239..8d0d389 100644
--- a/src/app/pages/typography/typography.html
+++ b/src/app/pages/typography/typography.html
@@ -66,7 +66,7 @@
 
           <div class="row">
             <div class="col-sm-6">
-              <div class="img-wrapper"><img src="release/img/typo03.png" alt="" title=""/></div>
+              <div class="img-wrapper"><img src="img/typo03.png" alt="" title=""/></div>
               <p>Vel elit, eros elementum, id lacinia, duis non ut ut tortor blandit. Mauris <a
                   href>dapibus</a> magna rutrum. Ornare neque suspendisse <a
                   href>phasellus wisi</a>, quam cras pede rutrum suspendisse, <a
@@ -75,7 +75,7 @@
                 arcu nulla.</p>
             </div>
             <div class="col-sm-6">
-              <div class="img-wrapper"><img src="release/img/typo01.png" alt="" title=""/></div>
+              <div class="img-wrapper"><img src="img/typo01.png" alt="" title=""/></div>
               <p>Et suspendisse, adipiscing fringilla ornare sit ligula sed, vel nam. Interdum et justo nulla, fermentum
                 lobortis purus ut eu, duis nibh dolor massa tristique elementum, nibh iste potenti risus fusce aliquet
                 fusce, ullamcorper debitis primis arcu tellus vestibulum ac.</p>
@@ -97,19 +97,19 @@
           </div>
           <div class="row">
             <div class="col-sm-4">
-              <div class="img-wrapper"><img src="release/img/typo04.png" alt=""/></div>
+              <div class="img-wrapper"><img src="img/typo04.png" alt=""/></div>
               <p>Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna
                 maecenas</p>
               <a href class="learn-more">Lean more</a>
             </div>
             <div class="col-sm-4">
-              <div class="img-wrapper"><img src="release/img/typo05.png" alt=""/></div>
+              <div class="img-wrapper"><img src="img/typo05.png" alt=""/></div>
               <p>Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat in
                 velit</p>
               <a href class="learn-more">Lean more</a>
             </div>
             <div class="col-sm-4">
-              <div class="img-wrapper"><img src="release/img/typo06.png" alt=""/></div>
+              <div class="img-wrapper"><img src="img/typo06.png" alt=""/></div>
               <p>Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam</p>
               <a href class="learn-more">Lean more</a>
             </div>
@@ -153,7 +153,7 @@
 
         <div class="banner">
           <div class="large-banner-wrapper">
-            <img src="release/img/banner.png" alt=""/>
+            <img src="img/banner.png" alt=""/>
           </div>
 
           <div class="banner-text-wrapper">
diff --git a/src/app/pages/typography/typography.js b/src/app/pages/typography/typography.js
index c936c70..1b3276b 100644
--- a/src/app/pages/typography/typography.js
+++ b/src/app/pages/typography/typography.js
@@ -4,7 +4,7 @@ angular.module('BlurAdmin.typographyPage', ['ngRoute'])
 
     .config(['$routeProvider', function ($routeProvider) {
       $routeProvider.when('/typography', {
-        templateUrl: '/app/pages/typography/typography.html',
+        templateUrl: 'app/pages/typography/typography.html',
         controller: 'typographyPageCtrl'
       });
     }])
diff --git a/src/assets/img/comments.svg b/src/assets/img/comments.svg
new file mode 100644
index 0000000..1b25401
--- /dev/null
+++ b/src/assets/img/comments.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="511.62px" height="511.619px" viewBox="0 0 511.62 511.619" style="enable-background:new 0 0 511.62 511.619;"
+	 xml:space="preserve" fill="#9d498c">
+<g>
+	<g>
+		<path d="M301.923,327.602c30.93-13.038,55.34-30.785,73.228-53.248c17.891-22.458,26.837-46.915,26.837-73.372
+			c0-26.458-8.946-50.914-26.837-73.376c-17.888-22.459-42.298-40.208-73.228-53.249c-30.93-13.039-64.571-19.556-100.928-19.556
+			c-36.354,0-69.995,6.521-100.927,19.56C69.14,87.4,44.729,105.149,26.84,127.609C8.947,150.068,0,174.523,0,200.982
+			c0,22.648,6.764,43.975,20.276,63.957c13.512,19.985,32.071,36.833,55.671,50.535c-1.902,4.572-3.853,8.754-5.852,12.566
+			c-2,3.806-4.377,7.467-7.139,10.991c-2.76,3.525-4.899,6.283-6.423,8.275c-1.523,1.998-3.997,4.809-7.424,8.422
+			c-3.428,3.617-5.618,5.996-6.567,7.135c0-0.191-0.383,0.24-1.143,1.287c-0.763,1.047-1.191,1.52-1.287,1.431
+			c-0.094-0.103-0.476,0.373-1.141,1.42c-0.666,1.048-1,1.571-1,1.571l-0.715,1.423c-0.284,0.568-0.476,1.137-0.57,1.712
+			c-0.096,0.567-0.144,1.19-0.144,1.854s0.094,1.28,0.286,1.854c0.383,2.471,1.477,4.466,3.284,5.996
+			c1.809,1.52,3.757,2.279,5.854,2.279h0.857c9.515-1.332,17.701-2.854,24.552-4.569c29.312-7.614,55.771-19.797,79.372-36.545
+			c17.128,3.046,33.88,4.568,50.248,4.568C237.349,347.156,270.994,340.641,301.923,327.602z M142.184,303.767l-12.564,8.846
+			c-5.33,3.614-11.227,7.331-17.7,11.14l9.995-23.986l-27.694-15.988c-18.276-10.656-32.454-23.219-42.542-37.685
+			c-10.089-14.465-15.131-29.502-15.131-45.111c0-19.417,7.474-37.594,22.414-54.534c14.938-16.94,35.067-30.358,60.382-40.259
+			c25.313-9.895,52.532-14.847,81.653-14.847c29.121,0,56.342,4.952,81.654,14.847c25.313,9.9,45.442,23.319,60.388,40.259
+			c14.94,16.939,22.408,35.116,22.408,54.534c0,19.414-7.468,37.59-22.408,54.53c-14.945,16.945-35.074,30.36-60.388,40.256
+			c-25.312,9.897-52.53,14.846-81.654,14.846c-14.272,0-28.833-1.335-43.681-3.997L142.184,303.767z"/>
+		<path d="M491.347,338.156c13.518-19.896,20.272-41.255,20.272-64.098c0-23.411-7.139-45.303-21.409-65.666
+			c-14.277-20.362-33.694-37.305-58.245-50.819c4.374,14.274,6.563,28.739,6.563,43.398c0,25.503-6.368,49.676-19.129,72.519
+			c-12.752,22.836-31.025,43.01-54.816,60.524c-22.08,15.988-47.205,28.261-75.377,36.829
+			c-28.164,8.562-57.573,12.848-88.218,12.848c-5.708,0-14.084-0.377-25.122-1.137c38.256,25.119,83.177,37.685,134.756,37.685
+			c16.371,0,33.119-1.526,50.251-4.571c23.6,16.755,50.06,28.931,79.37,36.549c6.852,1.718,15.037,3.237,24.554,4.568
+			c2.283,0.195,4.381-0.476,6.283-1.995c1.903-1.526,3.142-3.614,3.71-6.276c-0.089-1.143,0-1.77,0.287-1.861
+			c0.281-0.09,0.233-0.712-0.144-1.852c-0.376-1.144-0.568-1.715-0.568-1.715l-0.712-1.424c-0.198-0.376-0.52-0.903-0.999-1.567
+			c-0.476-0.66-0.855-1.14-1.143-1.427c-0.28-0.284-0.705-0.763-1.28-1.424c-0.568-0.66-0.951-1.092-1.143-1.283
+			c-0.951-1.143-3.139-3.521-6.564-7.139c-3.429-3.613-5.899-6.42-7.422-8.418c-1.523-1.999-3.665-4.757-6.424-8.282
+			c-2.758-3.518-5.14-7.183-7.139-10.991c-1.998-3.806-3.949-7.995-5.852-12.56C459.281,374.855,477.843,358.059,491.347,338.156z"
+			/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/src/assets/img/shopping-cart.svg b/src/assets/img/shopping-cart.svg
new file mode 100644
index 0000000..2ffe9c0
--- /dev/null
+++ b/src/assets/img/shopping-cart.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 459.529 459.529" style="enable-background:new 0 0 459.529 459.529;" xml:space="preserve" fill="#348779">
+<g>
+	<g>
+		<path d="M17,55.231h48.733l69.417,251.033c1.983,7.367,8.783,12.467,16.433,12.467h213.35c6.8,0,12.75-3.967,15.583-10.2
+			l77.633-178.5c2.267-5.383,1.7-11.333-1.417-16.15c-3.117-4.817-8.5-7.65-14.167-7.65H206.833c-9.35,0-17,7.65-17,17
+			s7.65,17,17,17H416.5l-62.9,144.5H164.333L94.917,33.698c-1.983-7.367-8.783-12.467-16.433-12.467H17c-9.35,0-17,7.65-17,17
+			S7.65,55.231,17,55.231z"/>
+		<path d="M135.433,438.298c21.25,0,38.533-17.283,38.533-38.533s-17.283-38.533-38.533-38.533S96.9,378.514,96.9,399.764
+			S114.183,438.298,135.433,438.298z"/>
+		<path d="M376.267,438.298c0.85,0,1.983,0,2.833,0c10.2-0.85,19.55-5.383,26.35-13.317c6.8-7.65,9.917-17.567,9.35-28.05
+			c-1.417-20.967-19.833-37.117-41.083-35.7c-21.25,1.417-37.117,20.117-35.7,41.083
+			C339.433,422.431,356.15,438.298,376.267,438.298z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/src/assets/js/global-variables.js b/src/assets/js/global-variables.js
index 5511a6b..af68634 100644
--- a/src/assets/js/global-variables.js
+++ b/src/assets/js/global-variables.js
@@ -1,24 +1,24 @@
 'use strict';
 
-var colorPrimary = "#41bee9";
-var colorInfo = "#5bc0de";
-var colorDanger = "#9d498c";
-var colorSuccess = "#348779";
-var colorWarning = "#bbcb50";
-var colorDefault = "#e1e1e1";
-var colorSuccessLight = "#85BA54";
-var colorPrimaryLight = "#5FBCBB";
-var colorWarningLight = "#c5d36a";
-var colorPrimaryDark = "#1488b0";
-var colorDangerDark = "#632e58";
-var colorSuccessDark = "#1c4a42";
-var colorWarningDark = "#8b992d";
+var colorPrimary = '#41bee9';
+var colorInfo = '#5bc0de';
+var colorDanger = '#9d498c';
+var colorSuccess = '#348779';
+var colorWarning = '#bbcb50';
+var colorDefault = '#e1e1e1';
+var colorSuccessLight = '#85BA54';
+var colorPrimaryLight = '#5FBCBB';
+var colorWarningLight = '#c5d36a';
+var colorPrimaryDark = '#1488b0';
+var colorDangerDark = '#632e58';
+var colorSuccessDark = '#1c4a42';
+var colorWarningDark = '#8b992d';
 
-var colorPrimaryBg = "#C5ECF9";
-var colorSuccessBg = "#C1DBD7";
-var colorDangerBg = "#E1C8DD";
+var colorPrimaryBg = '#C5ECF9';
+var colorSuccessBg = '#C1DBD7';
+var colorDangerBg = '#E1C8DD';
 
 
-var colorDefaultText = "#585858";
+var colorDefaultText = '#585858';
 
 var pageLoaded = false;
\ No newline at end of file
diff --git a/src/auth.html b/src/auth.html
index 39c5e4b..a38295a 100644
--- a/src/auth.html
+++ b/src/auth.html
@@ -8,11 +8,11 @@
 
   <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
-  <link rel="icon" type="image/png" sizes="32x32" href="release/img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="release/img/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="release/img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
 
-  <link rel="stylesheet" href="release/css/auth.min.css">
+  <link rel="stylesheet" href="css/auth.min.css">
 
   <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/src/index.html b/src/index.html
index 4feac58..3d6172c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,11 +8,11 @@
 
   <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
-  <link rel="icon" type="image/png" sizes="32x32" href="release/img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="release/img/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="release/img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
 
-  <link rel="stylesheet" href="release/css/index.min.css">
+  <link rel="stylesheet" href="css/index.min.css">
 
   <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -57,10 +57,10 @@
   <div></div>
 </div>
 
-<script src="release/js/lib.min.js"></script>
+<script src="js/lib.min.js"></script>
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script src="release/js/bundle.min.js"></script>
-<script src="release/js/templates.js"></script>
+<script src="js/bundle.min.js"></script>
+<script src="js/templates.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/reg.html b/src/reg.html
index 8190e99..36338db 100644
--- a/src/reg.html
+++ b/src/reg.html
@@ -8,11 +8,11 @@
 
   <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
-  <link rel="icon" type="image/png" sizes="32x32" href="release/img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="release/img/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="release/img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
 
-  <link rel="stylesheet" href="release/css/auth.min.css">
+  <link rel="stylesheet" href="css/auth.min.css">
 
   <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->