diff --git a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
index f0e8a398..b487bd50 100644
--- a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
+++ b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
@@ -33,17 +33,17 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
 
         if ( this.observableMedia.isActive(this.mdIsLockedOpenBreakpoint) )
         {
-            this.isLockedOpen = true;
-            this.mdSidenav.mode = 'side';
             setTimeout(() => {
+                this.isLockedOpen = true;
+                this.mdSidenav.mode = 'side';
                 this.mdSidenav.open();
             });
         }
         else
         {
-            this.isLockedOpen = false;
-            this.mdSidenav.mode = 'over';
             setTimeout(() => {
+                this.isLockedOpen = false;
+                this.mdSidenav.mode = 'over';
                 this.mdSidenav.close();
             });
         }
@@ -51,15 +51,19 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
         this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => {
             if ( this.observableMedia.isActive(this.mdIsLockedOpenBreakpoint) )
             {
-                this.isLockedOpen = true;
-                this.mdSidenav.mode = 'side';
-                this.mdSidenav.open();
+                setTimeout(() => {
+                    this.isLockedOpen = true;
+                    this.mdSidenav.mode = 'side';
+                    this.mdSidenav.open();
+                });
             }
             else
             {
-                this.isLockedOpen = false;
-                this.mdSidenav.mode = 'over';
-                this.mdSidenav.close();
+                setTimeout(() => {
+                    this.isLockedOpen = false;
+                    this.mdSidenav.mode = 'over';
+                    this.mdSidenav.close();
+                });
             }
         });
 
diff --git a/src/app/main/content/apps/chat/chat.component.html b/src/app/main/content/apps/chat/chat.component.html
index b335d9ed..b97a448d 100644
--- a/src/app/main/content/apps/chat/chat.component.html
+++ b/src/app/main/content/apps/chat/chat.component.html
@@ -1,4 +1,4 @@
-<div id="calendar" class="page-layout carded fullwidth">
+<div id="chat" class="page-layout carded fullwidth">
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/apps/chat/chat.component.scss b/src/app/main/content/apps/chat/chat.component.scss
index e642757d..db816f66 100644
--- a/src/app/main/content/apps/chat/chat.component.scss
+++ b/src/app/main/content/apps/chat/chat.component.scss
@@ -1,4 +1,6 @@
-#calendar {
+@import "src/app/core/scss/fuse";
+
+#chat {
     display: flex;
     flex: 1;
 
@@ -7,6 +9,10 @@
         max-width: 1400px;
         margin: 0 auto;
 
+        @include media-breakpoint(xs) {
+            padding: 8px !important;
+        }
+
         .content-card {
             display: flex;
             flex: 1;
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 79e111e8..a08ead08 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -688,7 +688,7 @@
         <!-- / CENTER -->
 
         <!-- SIDENAV -->
-        <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
+        <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
             <div class="sidenav-content" perfect-scrollbar>
                 <!-- WIDGET GROUP -->
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index 0c32001a..81c84dc5 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -18,7 +18,7 @@
 
             <a href="http://themeforest.net/item/fuse-angularjs-material-design-admin-template/12931855?ref=srcn"
                target="_blank" md-raised-button class="ml-8 ml-sm-24 md-pink-bg" fxFlex="0 0 auto" fxLayout="row"
-               fxLayoutAlign="start center">
+               fxLayoutAlign="start center" fxHide fxShow.gt-xs>
                 <md-icon class="s-16 mr-sm-4">shopping_cart</md-icon>
                 <span fxHide fxShow.gt-xs>Purchase Fuse template (Angular4+)</span>
             </a>
@@ -62,7 +62,7 @@
 
             <div class="toolbar-separator"></div>
 
-            <button md-button
+            <button md-button fxHide fxShow.gt-xs
                     class="language-button"
                     [mdMenuTriggerFor]="languageMenu">
                 <div fxLayout="row" fxLayoutAlign="center center">