diff --git a/package-lock.json b/package-lock.json
index c090b0a6..48a9116e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "@angular/animations": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.4.tgz",
-      "integrity": "sha1-Ascms7cK49LhVXBMjGDpuvAVR+8=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.5.tgz",
+      "integrity": "sha1-hapFTIh8x8zhFjfqX26a+tiEkOE=",
       "requires": {
         "tslib": "1.7.1"
       }
@@ -32,20 +32,20 @@
       }
     },
     "@angular/cli": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.3.0.tgz",
-      "integrity": "sha512-Sv6Gly7yNPZtNEsJJegtHxUTrkrvl0IsDRVcALrBQzdMvMXRWOEhn1jrdOY5HtU9eFQ27sdqrwijUVrTabZubw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.3.1.tgz",
+      "integrity": "sha512-khmFQjuuqUxulvPnYTaThSf7Dw5B5blMuVsU8MkSe3mfdyc/x/DaKjfPXDfFNGoDiiSJfMwob2CT3OYQOPI2MQ==",
       "dev": true,
       "requires": {
         "@angular-devkit/build-optimizer": "0.0.13",
         "@ngtools/json-schema": "1.1.0",
-        "@ngtools/webpack": "1.6.0",
+        "@ngtools/webpack": "1.6.1",
         "autoprefixer": "6.7.7",
         "chalk": "2.1.0",
         "circular-dependency-plugin": "3.0.0",
         "common-tags": "1.4.0",
         "core-object": "3.1.4",
-        "css-loader": "0.28.4",
+        "css-loader": "0.28.5",
         "cssnano": "3.10.0",
         "denodeify": "1.2.1",
         "diff": "3.3.0",
@@ -61,7 +61,7 @@
         "heimdalljs-logger": "0.1.9",
         "html-webpack-plugin": "2.30.1",
         "inflection": "1.12.0",
-        "inquirer": "3.2.1",
+        "inquirer": "3.2.2",
         "isbinaryfile": "3.0.2",
         "istanbul-instrumenter-loader": "2.0.0",
         "karma-source-map-support": "1.2.0",
@@ -103,28 +103,28 @@
       }
     },
     "@angular/common": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.4.tgz",
-      "integrity": "sha1-mPt9bo2mM7pWhE1cAJhspAeuqVA=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.5.tgz",
+      "integrity": "sha1-X2sRNH6uHfw0YjzP1MBsj0xIji0=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.4.tgz",
-      "integrity": "sha1-mxaueF8iuRiqFo2wVVwFMEuvnXc=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.5.tgz",
+      "integrity": "sha1-UNPJhmV77/H+9Pbdmj+ljiSr1Ug=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.4.tgz",
-      "integrity": "sha1-PRbshpw59KyhjKxx3PEYqA9iCOY=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.5.tgz",
+      "integrity": "sha1-JOmbNsCQk2P/gke/MxqLiert/mM=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.3.4",
+        "@angular/tsc-wrapped": "4.3.5",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       },
@@ -138,9 +138,9 @@
       }
     },
     "@angular/core": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.4.tgz",
-      "integrity": "sha1-Qt2ARmAPWggKThISEWsS/pe8/LQ=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.5.tgz",
+      "integrity": "sha1-vR79vx68+5wnojjiqkxIFZsIlbs=",
       "requires": {
         "tslib": "1.7.1"
       }
@@ -151,25 +151,25 @@
       "integrity": "sha1-uc9XhlqTyhWP5W2FCVJCPySNEDs="
     },
     "@angular/forms": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.4.tgz",
-      "integrity": "sha1-V/oHt7+RA/G5SPv+TP7TFAksnpY=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.5.tgz",
+      "integrity": "sha1-UZqtCtgqG4cBmTf6k/wUdzRzd4c=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.4.tgz",
-      "integrity": "sha1-diy3wDIFn0Hf0FU/V06c4NXswKk=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.5.tgz",
+      "integrity": "sha1-gdSwdhyO8DXLC3NjAMI382KG8fA=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/language-service": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.4.tgz",
-      "integrity": "sha1-OkSiJ6IlaUHrMoBX48E3KGioUW8=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.5.tgz",
+      "integrity": "sha1-ttiC6kDRjVE/w6A1p5h1Ap/jjwE=",
       "dev": true
     },
     "@angular/material": {
@@ -181,33 +181,33 @@
       }
     },
     "@angular/platform-browser": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.4.tgz",
-      "integrity": "sha1-3t6P8xRBokUvIC7XmKCCLrxakVM=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.5.tgz",
+      "integrity": "sha1-wNA0CUmcwp+BZ3qrYjyQhnYNhO8=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.4.tgz",
-      "integrity": "sha1-v3uEHy/I0g7+dW/h5QqgKMletXw=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.5.tgz",
+      "integrity": "sha1-Sml7OwrsgFsziE/UqbNHMGW6seA=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/router": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.4.tgz",
-      "integrity": "sha1-IGWI/sRm+DonaL11bFZkZRCR5Hc=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.5.tgz",
+      "integrity": "sha1-GICCdHvJtpdPnUs/VVe0NGRdI80=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.4.tgz",
-      "integrity": "sha1-hsFM7A7n8lu3p/gCcL/+Gf56zWM=",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.5.tgz",
+      "integrity": "sha1-lf2qgTz8VyYvx+9f6nJtYorvq6w=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -220,9 +220,9 @@
       "dev": true
     },
     "@ngtools/webpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.6.0.tgz",
-      "integrity": "sha512-qlY3Fj5ZJULIeFVvnnmzrKJCJnBkZ3rDf6ApaSc3uAAlhWjmBenUCJKlDQFTYZ6SuixmGYN3WTR5kGy6P7jZrA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.6.1.tgz",
+      "integrity": "sha512-a+nmdxKadC7Fz6NkolsAUzutjdajL3tupEfvJccwaBtmok/JJOps8a4lZnWKMTb/3+zsg8xZIGlSEXrTwPLNmA==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -264,9 +264,9 @@
       }
     },
     "@types/node": {
-      "version": "6.0.85",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.85.tgz",
-      "integrity": "sha512-6qLZpfQFO/g5Ns2e7RsW6brk0Q6Xzwiw7kVVU/XiQNOiJXSojhX76GP457PBYIsNMH2WfcGgcnZB4awFDHrwpA==",
+      "version": "6.0.87",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz",
+      "integrity": "sha512-Xo0pYENOBaGtJUhi50KH6gdBNQmZQQxAwBArsJpBd15ncoz+LZD5Ev14vuezcw62CsQ1q6bM++7jA6jfwaAbfQ==",
       "dev": true
     },
     "@types/q": {
@@ -636,7 +636,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000715",
+        "caniuse-db": "1.0.30000716",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.17",
@@ -1069,7 +1069,7 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000715",
+        "caniuse-db": "1.0.30000716",
         "electron-to-chromium": "1.3.18"
       }
     },
@@ -1158,15 +1158,15 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000715",
+        "caniuse-db": "1.0.30000716",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000715",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000715.tgz",
-      "integrity": "sha1-C5tceVlQ37rzAaiAa6/ofxJtqMo=",
+      "version": "1.0.30000716",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000716.tgz",
+      "integrity": "sha1-sHF3ZdFXZi6MdKYVYshMn8NgSkk=",
       "dev": true
     },
     "caseless": {
@@ -1180,7 +1180,6 @@
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
-      "optional": true,
       "requires": {
         "align-text": "0.1.4",
         "lazy-cache": "1.0.4"
@@ -1190,8 +1189,7 @@
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
           "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1769,9 +1767,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.4",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz",
-      "integrity": "sha1-bPNXkZLONV6LONX0Ldeh8uyJjQ8=",
+      "version": "0.28.5",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.5.tgz",
+      "integrity": "sha512-/FJmsDD8e6xZOBHMFShN/BCjnrEybq0spYaTZ1QoZ10/jhUa1LDDojQELu/JJ1ykZZjt0nSwkYrb2Mfx3bZx3Q==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.22.0",
@@ -1787,7 +1785,7 @@
         "postcss-modules-scope": "1.1.0",
         "postcss-modules-values": "1.3.0",
         "postcss-value-parser": "3.3.0",
-        "source-list-map": "0.1.8"
+        "source-list-map": "2.0.0"
       }
     },
     "css-parse": {
@@ -1911,7 +1909,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.27"
+        "es5-ext": "0.10.29"
       }
     },
     "d3": {
@@ -2367,9 +2365,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz",
-      "integrity": "sha1-I2nUUDivBF84mOb6VoYq7T9AKWw=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz",
+      "integrity": "sha512-kN+DjfGF7dJGUL7nWRktL9Z18t1rWP3aQlyZdY8XlpvU3Nc6GeFTQApftcjtWKxAZfiggZSGrCEoszNgvnpwDg==",
       "dev": true,
       "requires": {
         "ip": "1.1.5",
@@ -2432,12 +2430,6 @@
         }
       }
     },
-    "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
-      "dev": true
-    },
     "domain-browser": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
@@ -2679,9 +2671,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.27",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz",
-      "integrity": "sha512-3KXJRYzKXTd7xfFy5uZsJCXue55fAYQ035PRjyYk2PicllxIwcW9l3AbM/eGaw3vgVAUW4tl4xg9AXDEI6yw0w==",
+      "version": "0.10.29",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.29.tgz",
+      "integrity": "sha512-KXla9NXo5sdaEkGSmbFPYgjH6m75kxsthL6GDRSug/Y2OiMoYm0I9giL39j4cgmaFmAbkIFJ6gG+SGKnLSmOvA==",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.1",
@@ -2695,7 +2687,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27",
+        "es5-ext": "0.10.29",
         "es6-symbol": "3.1.1"
       }
     },
@@ -2706,7 +2698,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27",
+        "es5-ext": "0.10.29",
         "es6-iterator": "2.0.1",
         "es6-set": "0.1.5",
         "es6-symbol": "3.1.1",
@@ -2720,7 +2712,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27",
+        "es5-ext": "0.10.29",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -2733,7 +2725,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27"
+        "es5-ext": "0.10.29"
       }
     },
     "es6-weak-map": {
@@ -2743,7 +2735,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27",
+        "es5-ext": "0.10.29",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1"
       }
@@ -2813,7 +2805,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.27"
+        "es5-ext": "0.10.29"
       }
     },
     "eventemitter3": {
@@ -2852,13 +2844,26 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "3.0.1",
+        "cross-spawn": "5.1.0",
         "get-stream": "3.0.0",
         "is-stream": "1.1.0",
         "npm-run-path": "2.0.2",
         "p-finally": "1.0.0",
         "signal-exit": "3.0.2",
         "strip-eof": "1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.2.14"
+          }
+        }
       }
     },
     "exit": {
@@ -3170,13 +3175,13 @@
       }
     },
     "firebase": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.2.0.tgz",
-      "integrity": "sha1-kYGgoixq/CsnvYEHib6sSKQ4IH0=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.3.0.tgz",
+      "integrity": "sha1-Idlakvhix+QG3fhxwXO1DxU/jUY=",
       "requires": {
         "dom-storage": "2.0.2",
         "faye-websocket": "0.9.3",
-        "jsonwebtoken": "7.4.1",
+        "jsonwebtoken": "7.4.2",
         "promise-polyfill": "6.0.2",
         "xmlhttprequest": "1.8.0"
       },
@@ -3235,9 +3240,9 @@
           }
         },
         "jsonwebtoken": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
-          "integrity": "sha1-fKMk9SFfi+A5zTWmxFu4y3SkSPs=",
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.2.tgz",
+          "integrity": "sha1-VxuQPAfodcD8WSA9GseGZ9gOCc0=",
           "requires": {
             "joi": "6.10.1",
             "jws": "3.1.4",
@@ -4433,24 +4438,6 @@
         "is-glob": "2.0.1"
       }
     },
-    "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
-      "dev": true,
-      "requires": {
-        "min-document": "2.19.0",
-        "process": "0.5.2"
-      },
-      "dependencies": {
-        "process": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
-          "dev": true
-        }
-      }
-    },
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -4750,7 +4737,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.0.27"
+        "uglify-js": "3.0.28"
       }
     },
     "html-webpack-plugin": {
@@ -5039,9 +5026,9 @@
       "dev": true
     },
     "inquirer": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz",
-      "integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz",
+      "integrity": "sha512-bTKLzEHJVATimZO/YFdLrom0lRx1BHfRYskFHfIMVkGdp8+dIZaxuU+4yrsS1lcu6YWywVQVVsfvdwESzbeqHw==",
       "dev": true,
       "requires": {
         "ansi-escapes": "2.0.0",
@@ -5920,7 +5907,15 @@
       "dev": true,
       "requires": {
         "p-locate": "2.0.0",
-        "path-exists": "2.1.0"
+        "path-exists": "3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
       }
     },
     "lodash": {
@@ -6217,15 +6212,6 @@
       "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
       "dev": true
     },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "dev": true,
-      "requires": {
-        "dom-walk": "0.1.1"
-      }
-    },
     "minimalistic-assert": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
@@ -6297,7 +6283,7 @@
       "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=",
       "dev": true,
       "requires": {
-        "dns-packet": "1.1.1",
+        "dns-packet": "1.2.2",
         "thunky": "0.1.0"
       }
     },
@@ -6335,14 +6321,14 @@
       "dev": true
     },
     "ngx-color-picker": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-4.3.0.tgz",
-      "integrity": "sha512-O2Cpmyxnsp7B2ekx1ff42qE+lF8Dffg3SRqpkG489A8zPPIHL9E9zAUIVvmCGPOSw1DOD/864EP+hfGV5eFHvQ=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-4.3.1.tgz",
+      "integrity": "sha512-/Gn3XvOgaAK/ZnXA0ej9ivYm6uIvHwvZaSzx04ZUtG1Vw5RCKzw84dK0Ru9Ylnnq1xJU4WmdA63REkJb8cvYXg=="
     },
     "ngx-perfect-scrollbar": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.5.3.tgz",
-      "integrity": "sha512-XM5oyHFQCutV8IzAAIxbIWSTmVTgiijzm5IV2IUZcouOOdyXRlGKqdeLMUCM2OVuNjs88oWtxDz0I1qVyvzL8A==",
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.5.5.tgz",
+      "integrity": "sha512-tC5unIM2JC6ciWHHOq1yjPe1cBvhLZzJa83GFFxqSBRgje6yU8LU2O+FkeZinAsB4F61bwfDg0tTVbK71I2oYg==",
       "requires": {
         "perfect-scrollbar": "0.7.1"
       }
@@ -6424,7 +6410,7 @@
         "stream-browserify": "2.0.1",
         "stream-http": "2.7.2",
         "string_decoder": "0.10.31",
-        "timers-browserify": "2.0.3",
+        "timers-browserify": "2.0.4",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
         "util": "0.10.3",
@@ -7562,7 +7548,7 @@
       "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.85",
+        "@types/node": "6.0.87",
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "2.53.42",
         "blocking-proxy": "0.0.5",
@@ -8081,7 +8067,6 @@
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "align-text": "0.1.4"
       }
@@ -8424,6 +8409,21 @@
         }
       }
     },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -8643,9 +8643,9 @@
       }
     },
     "source-list-map": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
       "dev": true
     },
     "source-map": {
@@ -9061,12 +9061,11 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz",
-      "integrity": "sha512-+JAqyNgg+M8+gXIrq2EeUr4kZqRz47Ysco7X5QKRGScRE9HIHckyHD1asozSFGeqx2nmPCgA8T5tIGVO0ML7/w==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
+      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
       "dev": true,
       "requires": {
-        "global": "4.3.2",
         "setimmediate": "1.0.5"
       }
     },
@@ -9289,9 +9288,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.0.27",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz",
-      "integrity": "sha512-HD8CmxPXUI62v5tweiulMcP/apAtx1DXGcNZkhKQZyC+MTrTsoCBb8yPAwVrbvpgw3EpRU76bRe6axjIiCYcQg==",
+      "version": "3.0.28",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz",
+      "integrity": "sha512-0h/qGay016GG2lVav3Kz174F3T2Vjlz2v6HCt+WDQpoXfco0hWwF5gHK9yh88mUYvIC+N7Z8NT8WpjSp1yoqGA==",
       "dev": true,
       "requires": {
         "commander": "2.11.0",
@@ -9319,28 +9318,48 @@
         "camelcase": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
         },
         "cliui": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE="
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
         },
         "uglify-js": {
           "version": "2.8.29",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          }
         },
         "wordwrap": {
           "version": "0.0.2",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
         },
         "yargs": {
           "version": "3.10.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E="
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
         }
       }
     },
@@ -9974,14 +9993,6 @@
       "requires": {
         "source-list-map": "2.0.0",
         "source-map": "0.5.6"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-          "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
-          "dev": true
-        }
       }
     },
     "websocket-driver": {
@@ -10061,8 +10072,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "wordwrap": {
       "version": "0.0.3",
diff --git a/package.json b/package.json
index 52c99c4f..d261b7c1 100644
--- a/package.json
+++ b/package.json
@@ -12,18 +12,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.3.4",
+    "@angular/animations": "^4.3.5",
     "@angular/cdk": "^2.0.0-beta.8",
-    "@angular/common": "^4.3.4",
-    "@angular/compiler": "^4.3.4",
-    "@angular/core": "^4.3.4",
+    "@angular/common": "^4.3.5",
+    "@angular/compiler": "^4.3.5",
+    "@angular/core": "^4.3.5",
     "@angular/flex-layout": "2.0.0-beta.8",
-    "@angular/forms": "^4.3.4",
-    "@angular/http": "^4.3.4",
+    "@angular/forms": "^4.3.5",
+    "@angular/http": "^4.3.5",
     "@angular/material": "^2.0.0-beta.8",
-    "@angular/platform-browser": "^4.3.4",
-    "@angular/platform-browser-dynamic": "^4.3.4",
-    "@angular/router": "^4.3.4",
+    "@angular/platform-browser": "^4.3.5",
+    "@angular/platform-browser-dynamic": "^4.3.5",
+    "@angular/router": "^4.3.5",
     "@swimlane/ngx-charts": "^6.0.1",
     "@swimlane/ngx-datatable": "^9.3.1",
     "@swimlane/ngx-dnd": "^2.2.0",
@@ -32,25 +32,25 @@
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.5.0",
     "d3": "^4.10.0",
-    "firebase": "^4.2.0",
+    "firebase": "^4.3.0",
     "hammerjs": "^2.0.8",
     "highlight.js": "^9.12.0",
     "intl": "^1.2.5",
     "moment": "^2.18.1",
-    "ngx-color-picker": "^4.3.0",
-    "ngx-perfect-scrollbar": "^4.5.3",
+    "ngx-color-picker": "^4.3.1",
+    "ngx-perfect-scrollbar": "^4.5.5",
     "rxjs": "^5.4.3",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.16"
   },
   "devDependencies": {
-    "@angular/cli": "^1.3.0",
-    "@angular/compiler-cli": "^4.3.4",
-    "@angular/language-service": "^4.3.4",
-    "@ngtools/webpack": "^1.6.0",
+    "@angular/cli": "^1.3.1",
+    "@angular/compiler-cli": "^4.3.5",
+    "@angular/language-service": "^4.3.5",
+    "@ngtools/webpack": "^1.6.1",
     "@types/jasmine": "^2.5.53",
     "@types/jasminewd2": "^2.0.2",
-    "@types/node": "^6.0.83",
+    "@types/node": "^6.0.87",
     "codelyzer": "~3.0.1",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
diff --git a/src/app/core/animations.ts b/src/app/core/animations.ts
index ad096f12..bcad7c27 100644
--- a/src/app/core/animations.ts
+++ b/src/app/core/animations.ts
@@ -75,7 +75,10 @@ export class Animations
         transition('* => *', [
             query(':enter, :leave', style({
                 position: 'absolute',
-                height  : '100vh'
+                top     : 0,
+                bottom  : 0,
+                left    : 0,
+                right   : 0
             })),
             query(':enter', style({
                 transform: 'translateY(100%)',
diff --git a/src/app/core/scss/partials/_icons.scss b/src/app/core/scss/partials/_icons.scss
index d64fd37f..44f18524 100644
--- a/src/app/core/scss/partials/_icons.scss
+++ b/src/app/core/scss/partials/_icons.scss
@@ -8,15 +8,23 @@ md-icon {
     min-height: 24px;
     line-height: 24px;
 
-    @for $size from 2 through 128 {
+    @each $breakpoint in map-keys($grid-breakpoints) {
 
-        &.s-#{$size * 2} {
-            font-size: #{($size * 2) + 'px'} !important;
-            width: #{($size * 2) + 'px'} !important;
-            height: #{($size * 2) + 'px'} !important;
-            min-width: #{($size * 2) + 'px'} !important;
-            min-height: #{($size * 2) + 'px'} !important;
-            line-height: #{($size * 2) + 'px'} !important;
+        @include media-breakpoint-up($breakpoint) {
+
+            $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+
+            @for $size from 2 through 128 {
+
+                &.s#{$infix}-#{$size * 2} {
+                    font-size: #{($size * 2) + 'px'} !important;
+                    width: #{($size * 2) + 'px'} !important;
+                    height: #{($size * 2) + 'px'} !important;
+                    min-width: #{($size * 2) + 'px'} !important;
+                    min-height: #{($size * 2) + 'px'} !important;
+                    line-height: #{($size * 2) + 'px'} !important;
+                }
+            }
         }
     }
 }
diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss
index 5843ea24..3bf274b5 100644
--- a/src/app/core/scss/partials/_page-layouts.scss
+++ b/src/app/core/scss/partials/_page-layouts.scss
@@ -37,7 +37,7 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
             background-image: $top-bg-image;
             background-size: cover;
 
-            @include media-breakpoint('sm') {
+            @include media-breakpoint-down('sm') {
                 height: $carded-header-height-sm;
             }
         }
@@ -72,7 +72,7 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                     min-height: $carded-header-height-without-toolbar;
                     max-height: $carded-header-height-without-toolbar;
 
-                    @include media-breakpoint('sm') {
+                    @include media-breakpoint-down('sm') {
                         height: $carded-header-height-without-toolbar-sm;
                         min-height: $carded-header-height-without-toolbar-sm;
                         max-height: $carded-header-height-without-toolbar-sm;
@@ -389,6 +389,7 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                         height: $header-height;
                         min-height: $header-height;
                         max-height: $header-height;
+                        background-image: $top-bg-image;
                     }
 
                     .center {
@@ -432,4 +433,83 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
         width: 100%;
         min-height: 100%;
     }
+
+    @include media-breakpoint-down('xs') {
+
+        // Activate single-scroll
+        &.carded {
+
+            &.fullwidth {
+
+                > .center {
+                    flex: 1 0 auto;
+                    max-height: none;
+                }
+            }
+
+            &.left-sidenav,
+            &.right-sidenav {
+
+                > md-sidenav-container {
+                    flex: 1 0 auto;
+                }
+            }
+        }
+
+        &.simple {
+
+            &.fullwidth {
+                overflow: visible;
+
+                > .content {
+                    flex: 1 0 auto;
+                }
+            }
+
+            &.left-sidenav,
+            &.right-sidenav {
+
+                > md-sidenav-container {
+                    flex: 1 0 auto !important;
+
+                    > .mat-sidenav-content {
+                        flex: 1 0 auto;
+
+                        > .center {
+                            overflow: hidden;
+                        }
+                    }
+                }
+            }
+        }
+        // End - Activate single-scroll
+
+        // Smaller margins
+        &.carded {
+
+            &.fullwidth {
+
+                > .center {
+                    padding: 0 16px;
+                }
+            }
+
+            &.left-sidenav,
+            &.right-sidenav {
+
+                > md-sidenav-container {
+
+                    > .mat-sidenav-content {
+
+                        .center {
+                            margin: 0 16px;
+                        }
+                    }
+                }
+            }
+        }
+        // End - Smaller margins
+    }
 }
+
+
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index a0ab0deb..22f6c51b 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,4 +1,4 @@
-<div id="calendar" class="page-layout simple fullwidth">
+<div id="calendar" class="page-layout simple fullwidth" perfect-scrollbar>
 
     <!-- HEADER -->
     <div class="header" [ngClass]="viewDate | date:'MMM'">
diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
index c6ecacf5..626b6b85 100644
--- a/src/app/main/content/apps/calendar/calendar.component.scss
+++ b/src/app/main/content/apps/calendar/calendar.component.scss
@@ -302,8 +302,6 @@
     }
 
     .content {
-        flex: 1;
-        overflow: auto;
         padding: 24px;
     }
 }
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.html b/src/app/main/content/apps/chat/chat-start/chat-start.component.html
index d07bb51d..f51a7779 100644
--- a/src/app/main/content/apps/chat/chat-start/chat-start.component.html
+++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.html
@@ -2,7 +2,7 @@
 
     <div class="big-circle mat-elevation-z1" fxLayout="column" fxLayoutAlign="center center">
 
-        <md-icon class="s-128">chat</md-icon>
+        <md-icon class="s-64 s-md-128">chat</md-icon>
 
     </div>
 
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss
index 2debabf7..7934fd4b 100644
--- a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss
+++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss
@@ -13,6 +13,12 @@
         line-height: 300px;
         text-align: center;
 
+        @include media-breakpoint-down('sm') {
+            width: 160px;
+            height: 160px;
+            line-height: 160px;
+        }
+
         md-icon {
             color: mat-color($accent);
         }
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
index 074df496..78fd80ee 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
@@ -43,4 +43,8 @@
     bottom: 12px;
     right: 12px;
     padding: 0;
+
+    @include media-breakpoint-down('xs') {
+        top: 12px;
+    }
 }
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index c744f807..06b5cee1 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -1,7 +1,8 @@
-<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" fxLayout="column">
+<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" fxLayout="column" perfect-scrollbar>
 
     <!-- HEADER -->
-    <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="space-between center">
+    <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="start start"
+         fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
 
         <!-- APP TITLE -->
         <div fxLayout="row" fxLayoutAlign="start center">
@@ -21,7 +22,7 @@
         <!-- / APP TITLE -->
 
         <!-- SEARCH -->
-        <div class="search-input-wrapper" fxLayout="row" fxLayoutAlign="start center">
+        <div class="search-input-wrapper mt-16 ml-8 m-sm-0" fxLayout="row" fxLayoutAlign="start center">
             <label for="search" class="mr-8">
                 <md-icon>search</md-icon>
             </label>
@@ -50,7 +51,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24 pr-92" perfect-scrollbar>
+        <div class="center p-24 pr-sm-92" perfect-scrollbar>
 
             <!-- CONTENT -->
             <div class="content md-white-bg mat-elevation-z4">
diff --git a/src/app/main/content/apps/contacts/contacts.component.scss b/src/app/main/content/apps/contacts/contacts.component.scss
index 52a72707..4ac7a3d9 100644
--- a/src/app/main/content/apps/contacts/contacts.component.scss
+++ b/src/app/main/content/apps/contacts/contacts.component.scss
@@ -2,4 +2,7 @@
 
 #contacts {
 
+    .content {
+        overflow: hidden;
+    }
 }
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index e28975db..f57508d1 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -1,4 +1,4 @@
-<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row">
+<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfect-scrollbar>
 
     <md-sidenav-container>
 
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index 2f78647f..40926094 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -1,4 +1,4 @@
-<div id="file-manager" class="page-layout simple right-sidenav" fxLayout="row">
+<div id="file-manager" class="page-layout simple right-sidenav" perfect-scrollbar>
 
     <md-sidenav-container>
 
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss
index 16c07066..7e0555a0 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.scss
+++ b/src/app/main/content/apps/file-manager/file-manager.component.scss
@@ -26,9 +26,15 @@
 
                 .header {
                     position: relative;
-                    height: 200px;
-                    min-height: 200px;
-                    max-height: 200px;
+                    height: 160px;
+                    min-height: 160px;
+                    max-height: 160px;
+
+                    @include media-breakpoint-down('sm'){
+                        height: 120px;
+                        min-height: 120px;
+                        max-height: 120px;
+                    }
 
                     .add-file-button {
                         position: absolute;
@@ -39,9 +45,6 @@
                 }
 
                 .content {
-                    display: flex;
-                    flex: 1;
-                    overflow: auto;
                 }
             }
         }
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
index 9e664d18..26ea45b6 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
@@ -6,9 +6,9 @@
 
     > .header {
         flex: 0 1 auto;
-        height: 200px;
-        min-height: 200px;
-        max-height: 200px;
+        height: 160px;
+        min-height: 160px;
+        max-height: 160px;
     }
 
     > .content {
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index d6259c76..b4bbc8ee 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -1,4 +1,4 @@
-<div id="mail" class="page-layout carded left-sidenav">
+<div id="mail" class="page-layout carded left-sidenav" perfect-scrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
index 5e1e2721..3782a525 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
+++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
@@ -1,6 +1,7 @@
 <div fxLayout="row" fxLayoutAlign="start center">
 
-    <md-icon class="handle mr-16" ngxDragHandle (click)="$event.stopPropagation()" fxFlex="0 1 auto">drag_handle
+    <md-icon class="handle mr-16" ngxDragHandle (click)="$event.stopPropagation()" fxFlex="0 1 auto" fxHide.xs>
+        drag_handle
     </md-icon>
 
     <md-checkbox [(ngModel)]="selected" (ngModelChange)="onSelectedChange()"
@@ -36,18 +37,20 @@
 
         <div class="actions" fxLayout="row" fxLayoutAlign="start center">
 
-            <button md-button class="mat-icon-button" (click)="toggleImportant($event)" aria-label="Toggle important">
+            <button md-button class="mat-icon-button" (click)="toggleImportant($event)" aria-label="Toggle important"
+                    fxHide.xs>
                 <md-icon *ngIf="todo.important">error</md-icon>
                 <md-icon *ngIf="!todo.important">error_outline</md-icon>
             </button>
 
-            <button md-button class="mat-icon-button" (click)="toggleStar($event)" aria-label="Toggle star">
+            <button md-button class="mat-icon-button" (click)="toggleStar($event)" aria-label="Toggle star"
+                    fxHide.xs>
                 <md-icon *ngIf="todo.starred">star</md-icon>
                 <md-icon *ngIf="!todo.starred">star_outline</md-icon>
             </button>
 
             <button md-button [mdMenuTriggerFor]="moreMenu" aria-label="More" class="mat-icon-button"
-                    ng-click="$mdOpenMenu($event)">
+                    ng-click="$mdOpenMenu($event)" fxHide.xs>
                 <md-icon>more_vert</md-icon>
             </button>
 
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
index e8932198..e53cb3a5 100644
--- a/src/app/main/content/apps/todo/todo.component.html
+++ b/src/app/main/content/apps/todo/todo.component.html
@@ -1,4 +1,4 @@
-<div id="todo" class="page-layout carded left-sidenav">
+<div id="todo" class="page-layout carded left-sidenav" perfect-scrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts
index f16e2455..fce6e17b 100644
--- a/src/app/main/content/content.component.ts
+++ b/src/app/main/content/content.component.ts
@@ -1,5 +1,4 @@
 import { Component, HostBinding, OnInit } from '@angular/core';
-import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { Animations } from '../../core/animations';
 
@@ -15,8 +14,7 @@ export class FuseContentComponent implements OnInit
 
     constructor(
         private router: Router,
-        private activatedRoute: ActivatedRoute,
-        private perfectScrollbarDirective: PerfectScrollbarDirective
+        private activatedRoute: ActivatedRoute
     )
     {
         this.router.events
@@ -29,14 +27,6 @@ export class FuseContentComponent implements OnInit
 
     ngOnInit()
     {
-        this.router.events.subscribe((event) => {
-                if ( event instanceof NavigationEnd )
-                {
-                    setTimeout(() => {
-                        this.perfectScrollbarDirective.scrollToTop();
-                    }, 0);
-                }
-            }
-        );
+
     }
 }
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
index 0f569649..4dc282f2 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth">
+<div class="page-layout carded fullwidth" perfect-scrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
index f931140a..df2365d5 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav">
+<div class="page-layout carded left-sidenav" perfect-scrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
index 047a4137..ff20f210 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav">
+<div class="page-layout carded right-sidenav" perfect-scrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
index 5de7b1e7..7740289f 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav inner-sidenav">
+<div class="page-layout simple left-sidenav inner-sidenav" perfect-scrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
index d476999b..4df8ed46 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav">
+<div class="page-layout simple left-sidenav" perfect-scrollbar>
 
     <md-sidenav-container>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
index e582b433..7329505e 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple right-sidenav inner-sidenav">
+<div class="page-layout simple right-sidenav inner-sidenav" perfect-scrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
index a2194474..b8988210 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple right-sidenav">
+<div class="page-layout simple right-sidenav" perfect-scrollbar>
 
     <md-sidenav-container>
 
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html
index 7e339ec2..95114f92 100644
--- a/src/app/main/main.component.html
+++ b/src/app/main/main.component.html
@@ -20,7 +20,7 @@
                 </ng-container>
                 <!-- / TOOLBAR: Below -->
 
-                <fuse-content perfect-scrollbar></fuse-content>
+                <fuse-content></fuse-content>
 
                 <!-- FOOTER: Below -->
                 <ng-container *ngIf="layoutSettings.footer === 'below'">
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss
index e88cc7b7..4ef20b24 100644
--- a/src/app/main/main.component.scss
+++ b/src/app/main/main.component.scss
@@ -32,12 +32,11 @@ fuse-main {
                         overflow: hidden;
 
                         fuse-content {
+                            position: relative;
                             display: flex;
                             flex: 1;
                             flex-direction: row;
                             width: 100%;
-                            overflow-x: hidden;
-                            overflow-y: auto;
 
                             > *:not(router-outlet):not(.ps__scrollbar-x-rail):not(.ps__scrollbar-y-rail) {
                                 display: flex;
@@ -45,6 +44,13 @@ fuse-main {
                                 width: 100%;
                                 min-width: 100%;
                             }
+
+                            > *.ng-animating {
+
+                                .mat-tab-body {
+                                    height: 100vh;
+                                }
+                            }
                         }
                     }
                 }
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index a6ba8ffb..9dce6159 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -25,7 +25,7 @@
                     class="user-button">
                 <div fxLayout="row" fxLayoutAlign="center center">
                     <img class="avatar" src="assets/images/avatars/profile.jpg">
-                    <span class="username mr-12" fxShow.gt-sm>John Doe</span>
+                    <span class="username mr-12" fxHide fxShow.gt-sm>John Doe</span>
                     <md-icon class="s-16" fxHide.xs>keyboard_arrow_down</md-icon>
                 </div>
             </button>
diff --git a/src/app/main/toolbar/toolbar.component.scss b/src/app/main/toolbar/toolbar.component.scss
index 4e4977aa..ad4f2658 100644
--- a/src/app/main/toolbar/toolbar.component.scss
+++ b/src/app/main/toolbar/toolbar.component.scss
@@ -1,7 +1,9 @@
+@import 'src/app/core/scss/fuse';
+
 :host {
     position: relative;
     display: flex;
-    flex: 0 1 auto;
+    flex: 0 0 auto;
     z-index: 4;
 
     &.below {
@@ -19,6 +21,10 @@
     .quick-panel-toggle-button {
         min-width: 64px;
         height: 64px;
+
+        @include media-breakpoint-down('xs') {
+            height: 56px;
+        }
     }
 
     .toggle-button-navbar {
@@ -30,5 +36,9 @@
         height: 64px;
         width: 1px;
         background: rgba(0, 0, 0, .12);
+
+        @include media-breakpoint-down('xs') {
+            height: 56px;
+        }
     }
 }
diff --git a/src/favicon.ico b/src/favicon.ico
index 8081c7ce..159603ed 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ