diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000..0a60c475
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+save-prefix=''
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index bb15a204..3937776d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse2",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -16,9 +16,9 @@
       }
     },
     "@angular/animations": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz",
-      "integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=",
+      "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"
       }
@@ -103,28 +103,28 @@
       }
     },
     "@angular/common": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz",
-      "integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz",
-      "integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz",
-      "integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=",
+      "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.6",
+        "@angular/tsc-wrapped": "4.3.5",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       },
@@ -138,9 +138,9 @@
       }
     },
     "@angular/core": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz",
-      "integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=",
+      "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"
       }
@@ -154,25 +154,25 @@
       }
     },
     "@angular/forms": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz",
-      "integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz",
-      "integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.6.tgz",
-      "integrity": "sha1-cc8tu0ZhVo89EqnA5LngQ++TvTo=",
+      "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": {
@@ -184,33 +184,33 @@
       }
     },
     "@angular/platform-browser": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz",
-      "integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz",
-      "integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz",
-      "integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=",
+      "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.6",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
-      "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
+      "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"
@@ -1546,26 +1546,15 @@
       "dev": true
     },
     "connect": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz",
-      "integrity": "sha1-aU6NIGgb/kkCgsiriGvpjwn0L+c=",
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz",
+      "integrity": "sha512-GLSZqgjVxPvGYVD/2vz//gS201MEXk4b7t3nHV6OVnTdDNWi/Gm7Rpxs/ybvljPWvULys/wrzIV3jB3YvEc3nQ==",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
-        "finalhandler": "1.0.3",
+        "debug": "2.6.8",
+        "finalhandler": "1.0.4",
         "parseurl": "1.3.1",
         "utils-merge": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "connect-history-api-fallback": {
@@ -3145,29 +3134,18 @@
       }
     },
     "finalhandler": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
-      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz",
+      "integrity": "sha512-16l/r8RgzlXKmFOhZpHBztvye+lAhC5SU7hXavnerC9UfZqZxxXl3BzL8MhffPT3kF61lj9Oav2LKEzh0ei7tg==",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
+        "debug": "2.6.8",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
         "parseurl": "1.3.1",
         "statuses": "1.3.1",
         "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "find-up": {
@@ -5547,9 +5525,9 @@
       }
     },
     "karma": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz",
-      "integrity": "sha1-b3oaQGRG+i4YfslTmGmPTO5HYmk=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
         "bluebird": "3.5.0",
@@ -5557,7 +5535,7 @@
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.2",
+        "connect": "3.6.3",
         "core-js": "2.5.0",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
diff --git a/package.json b/package.json
index 661a44bc..c2ccd5e0 100644
--- a/package.json
+++ b/package.json
@@ -1,70 +1,69 @@
 {
-    "name": "fuse2",
-    "version": "1.0.2",
-    "license": "",
-    "scripts": {
-        "ng": "ng",
-        "start": "ng serve",
-        "build": "ng build",
-        "test": "ng test",
-        "lint": "ng lint",
-        "e2e": "ng e2e"
-    },
-    "private": true,
-    "dependencies": {
-        "@angular/animations": "4.3.6",
-        "@angular/cdk": "2.0.0-beta.10",
-        "@angular/common": "4.3.6",
-        "@angular/compiler": "4.3.6",
-        "@angular/core": "4.3.6",
-        "@angular/flex-layout": "2.0.0-beta.9",
-        "@angular/forms": "4.3.6",
-        "@angular/http": "4.3.6",
-        "@angular/material": "2.0.0-beta.10",
-        "@angular/platform-browser": "4.3.6",
-        "@angular/platform-browser-dynamic": "4.3.6",
-        "@angular/router": "4.3.6",
-        "@swimlane/ngx-charts": "6.0.2",
-        "@swimlane/ngx-datatable": "9.3.1",
-        "@swimlane/ngx-dnd": "3.0.0",
-        "angular-calendar": "0.19.0",
-        "angular-in-memory-web-api": "0.3.2",
-        "classlist.js": "1.1.20150312",
-        "core-js": "2.5.0",
-        "d3": "4.10.0",
-        "hammerjs": "2.0.8",
-        "highlight.js": "9.12.0",
-        "intl": "1.2.5",
-        "md2": "0.0.28",
-        "moment": "2.18.1",
-        "ngx-color-picker": "4.3.1",
-        "ngx-cookie-service": "1.0.7",
-        "ngx-perfect-scrollbar": "4.5.6",
-        "rxjs": "5.4.3",
-        "web-animations-js": "2.3.1",
-        "zone.js": "0.8.17"
-    },
-    "devDependencies": {
-        "@angular/cli": "^1.3.2",
-        "@angular/compiler-cli": "4.3.6",
-        "@angular/language-service": "4.3.6",
-        "@ngtools/webpack": "^1.6.2",
-        "@types/jasmine": "^2.5.54",
-        "@types/jasminewd2": "^2.0.2",
-        "@types/node": "^6.0.88",
-        "codelyzer": "~3.0.1",
-        "jasmine-core": "~2.6.2",
-        "jasmine-spec-reporter": "~4.1.0",
-        "karma": "~1.7.0",
-        "karma-chrome-launcher": "~2.1.1",
-        "karma-cli": "~1.0.1",
-        "karma-coverage-istanbul-reporter": "^1.2.1",
-        "karma-jasmine": "~1.1.0",
-        "karma-jasmine-html-reporter": "^0.2.2",
-        "node-sass": "^4.5.3",
-        "protractor": "~5.1.2",
-        "ts-node": "~3.0.4",
-        "tslint": "~5.3.2",
-        "typescript": "~2.3.3"
-    }
+  "name": "fuse2",
+  "version": "1.0.3",
+  "license": "",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "4.3.5",
+    "@angular/cdk": "2.0.0-beta.10",
+    "@angular/common": "4.3.5",
+    "@angular/compiler": "4.3.5",
+    "@angular/core": "4.3.5",
+    "@angular/flex-layout": "2.0.0-beta.9",
+    "@angular/forms": "4.3.5",
+    "@angular/http": "4.3.5",
+    "@angular/material": "2.0.0-beta.10",
+    "@angular/platform-browser": "4.3.5",
+    "@angular/platform-browser-dynamic": "4.3.5",
+    "@angular/router": "4.3.5",
+    "@swimlane/ngx-charts": "6.0.2",
+    "@swimlane/ngx-datatable": "9.3.1",
+    "@swimlane/ngx-dnd": "3.0.0",
+    "angular-calendar": "0.19.0",
+    "angular-in-memory-web-api": "0.3.2",
+    "classlist.js": "1.1.20150312",
+    "core-js": "2.5.0",
+    "d3": "4.10.0",
+    "hammerjs": "2.0.8",
+    "highlight.js": "9.12.0",
+    "intl": "1.2.5",
+    "moment": "2.18.1",
+    "ngx-color-picker": "4.3.1",
+    "ngx-cookie-service": "1.0.7",
+    "ngx-perfect-scrollbar": "4.5.6",
+    "rxjs": "5.4.3",
+    "web-animations-js": "2.3.1",
+    "zone.js": "0.8.17"
+  },
+  "devDependencies": {
+    "@angular/cli": "^1.3.2",
+    "@angular/compiler-cli": "4.3.5",
+    "@angular/language-service": "4.3.5",
+    "@ngtools/webpack": "^1.6.2",
+    "@types/jasmine": "^2.5.54",
+    "@types/jasminewd2": "^2.0.2",
+    "@types/node": "^6.0.88",
+    "codelyzer": "~3.0.1",
+    "jasmine-core": "~2.6.2",
+    "jasmine-spec-reporter": "~4.1.0",
+    "karma": "1.7.1",
+    "karma-chrome-launcher": "~2.1.1",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "node-sass": "^4.5.3",
+    "protractor": "~5.1.2",
+    "ts-node": "~3.0.4",
+    "tslint": "~5.3.2",
+    "typescript": "~2.3.3"
+  }
 }
diff --git a/src/app/core/components/search-bar/search-bar.component.scss b/src/app/core/components/search-bar/search-bar.component.scss
index c32299be..aac6fb90 100644
--- a/src/app/core/components/search-bar/search-bar.component.scss
+++ b/src/app/core/components/search-bar/search-bar.component.scss
@@ -3,11 +3,14 @@
 :host {
 
     .fuse-search-bar {
+        min-width: 64px;
         height: 64px;
         font-size: 13px;
+
         @include media-breakpoint-down('xs') {
             height: 56px;
         }
+
         .fuse-search-bar-expander,
         .fuse-search-bar-collapser {
             cursor: pointer;
@@ -16,6 +19,7 @@
             width: 64px !important;
             height: 64px !important;
             line-height: 64px !important;
+
             @include media-breakpoint-down('xs') {
                 height: 56px !important;
                 line-height: 56px !important;
@@ -70,4 +74,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/core/components/shortcuts/shortcuts.component.html b/src/app/core/components/shortcuts/shortcuts.component.html
index 2cf61b36..ca3f7e0f 100644
--- a/src/app/core/components/shortcuts/shortcuts.component.html
+++ b/src/app/core/components/shortcuts/shortcuts.component.html
@@ -9,7 +9,7 @@
 
     <div class="shortcuts" fxHide fxShow.gt-sm [ngClass]="toolbarColor">
 
-        <div fxLayout="row" fxLayoutAlign="space-between center" fxFlex>
+        <div fxLayout="row" fxLayoutAlign="space-between center" fxFlex="0 1 auto">
 
             <div fxLayout="row" fxLayoutAlign="start center">
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index 9f8be19d..26bcf994 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -52,7 +52,8 @@
         <md-input-container>
             <textarea mdInput name="message"
                       placeholder="Message"
-                      formControlName="message">
+                      formControlName="message"
+                      rows="6">
             </textarea>
         </md-input-container>
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
index ef5d242a..595dfc75 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
@@ -8,23 +8,30 @@
         padding: 0;
         width: 720px;
 
-        .attachment-list {
-            font-size: 13px;
-            padding-top: 16px;
+        .compose-form {
+            
+            .mat-input-container {
+                width: 100%;
+            }
 
-            .attachment {
-                background-color: rgba(0, 0, 0, 0.08);
-                border: 1px solid rgba(0, 0, 0, 0.16);
-                padding-left: 16px;
-                margin-top: 8px;
-                border-radius: 2px;
+            .attachment-list {
+                font-size: 13px;
+                padding-top: 16px;
 
-                .filename {
-                    font-weight: 500;
-                }
+                .attachment {
+                    background-color: rgba(0, 0, 0, 0.08);
+                    border: 1px solid rgba(0, 0, 0, 0.16);
+                    padding-left: 16px;
+                    margin-top: 8px;
+                    border-radius: 2px;
 
-                &:last-child {
-                    margin-bottom: 0;
+                    .filename {
+                        font-weight: 500;
+                    }
+
+                    &:last-child {
+                        margin-bottom: 0;
+                    }
                 }
             }
         }
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss
index 9fb34571..dbed2d25 100644
--- a/src/app/main/main.component.scss
+++ b/src/app/main/main.component.scss
@@ -58,6 +58,7 @@ fuse-main {
                             flex: 1;
                             flex-direction: row;
                             width: 100%;
+                            overflow: hidden;
 
                             > *:not(router-outlet):not(.ps__scrollbar-x-rail):not(.ps__scrollbar-y-rail) {
                                 display: flex;
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index 50e07fea..0c32001a 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -2,7 +2,7 @@
 
     <div fxFlex fxFill fxLayout="row" fxLayoutAlign="start center">
 
-        <div fxFlex fxLayout="row" fxLayoutAlign="start center">
+        <div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center">
 
             <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="openBar" fxHide.gt-md>
                 <md-icon>menu</md-icon>