diff --git a/src/@fuse/components/search-bar/search-bar.module.ts b/src/@fuse/components/search-bar/search-bar.module.ts
index bc1a0595..f0968924 100644
--- a/src/@fuse/components/search-bar/search-bar.module.ts
+++ b/src/@fuse/components/search-bar/search-bar.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
-import { MatIconModule } from '@angular/material';
+import { MatButtonModule, MatIconModule } from '@angular/material';
 
 import { FuseSearchBarComponent } from './search-bar.component';
 
@@ -14,6 +14,7 @@ import { FuseSearchBarComponent } from './search-bar.component';
         CommonModule,
         RouterModule,
 
+        MatButtonModule,
         MatIconModule
     ],
     exports     : [
diff --git a/src/@fuse/components/shortcuts/shortcuts.module.ts b/src/@fuse/components/shortcuts/shortcuts.module.ts
index cefd73de..22e5e94b 100644
--- a/src/@fuse/components/shortcuts/shortcuts.module.ts
+++ b/src/@fuse/components/shortcuts/shortcuts.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material';
+import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material';
 import { CookieService } from 'ngx-cookie-service';
 
 import { FuseShortcutsComponent } from './shortcuts.component';
@@ -17,6 +17,7 @@ import { FuseShortcutsComponent } from './shortcuts.component';
 
         FlexLayoutModule,
 
+        MatButtonModule,
         MatDividerModule,
         MatFormFieldModule,
         MatIconModule,
diff --git a/src/@fuse/shared.module.ts b/src/@fuse/shared.module.ts
index 4a65c31f..9d82a601 100644
--- a/src/@fuse/shared.module.ts
+++ b/src/@fuse/shared.module.ts
@@ -4,9 +4,8 @@ import { CommonModule } from '@angular/common';
 
 import { FlexLayoutModule } from '@angular/flex-layout';
 
-import { FusePipesModule } from './pipes/pipes.module';
-
 import { FuseDirectivesModule } from '@fuse/directives/directives';
+import { FusePipesModule } from '@fuse/pipes/pipes.module';
 
 @NgModule({
     imports  : [
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 03b755f1..159c4403 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -10,13 +10,14 @@ import { FuseModule } from '@fuse/fuse.module';
 import { FuseSharedModule } from '@fuse/shared.module';
 
 // import { SharedModule } from 'app/shared/shared.module';
-import { config } from './config';
+import { fuseConfig } from './fuse-config';
 
 import { AppComponent } from './app.component';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
 import { FuseMainModule } from './main/main.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { AppStoreModule } from './store/store.module';
+import { MaterialModule } from '@fuse/modules/material.module';
 
 const appRoutes: Routes = [
     {
@@ -65,9 +66,10 @@ const appRoutes: Routes = [
         }),
 
         // SharedModule,
+        MaterialModule,
 
         // Fuse Main and Shared modules
-        FuseModule.forRoot(config),
+        FuseModule.forRoot(fuseConfig),
         FuseSharedModule,
 
         AppStoreModule,
diff --git a/src/app/config.ts b/src/app/fuse-config.ts
similarity index 95%
rename from src/app/config.ts
rename to src/app/fuse-config.ts
index 622fa675..2da07496 100644
--- a/src/app/config.ts
+++ b/src/app/fuse-config.ts
@@ -1,5 +1,5 @@
 // Default Fuse config
-export const config = {
+export const fuseConfig = {
     layout          : {
         navigation      : 'left', // 'right', 'left', 'top', 'none'
         navigationFolded: false, // true, false
diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts
index d18ed1b5..7764c050 100644
--- a/src/app/main/content/apps/apps.module.ts
+++ b/src/app/main/content/apps/apps.module.ts
@@ -10,7 +10,7 @@ const routes = [
         path        : 'dashboards/project',
         loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule'
     },
-    {
+    /*{
         path        : 'dashboards/analytics',
         loadChildren: './dashboards/analytics/analytics.module#FuseAnalyticsDashboardModule'
     },
@@ -53,7 +53,7 @@ const routes = [
     {
         path        : 'scrumboard',
         loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule'
-    }
+    }*/
 ];
 
 @NgModule({
diff --git a/src/app/main/content/apps/dashboards/project/project.module.ts b/src/app/main/content/apps/dashboards/project/project.module.ts
index e57c260b..b806b353 100644
--- a/src/app/main/content/apps/dashboards/project/project.module.ts
+++ b/src/app/main/content/apps/dashboards/project/project.module.ts
@@ -8,6 +8,7 @@ import { FuseWidgetModule } from '@fuse/components/widget/widget.module';
 
 import { FuseProjectDashboardComponent } from './project.component';
 import { ProjectDashboardService } from './project.service';
+import { MaterialModule } from '@fuse/modules/material.module';
 
 const routes: Routes = [
     {
@@ -21,8 +22,9 @@ const routes: Routes = [
 
 @NgModule({
     imports     : [
-        FuseSharedModule,
         RouterModule.forChild(routes),
+        FuseSharedModule,
+        MaterialModule,
         FuseWidgetModule,
         NgxChartsModule
     ],
diff --git a/src/app/main/toolbar/toolbar.module.ts b/src/app/main/toolbar/toolbar.module.ts
index e7edb246..4d61d960 100644
--- a/src/app/main/toolbar/toolbar.module.ts
+++ b/src/app/main/toolbar/toolbar.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material';
+import { MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material';
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
@@ -14,6 +14,7 @@ import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components';
     imports     : [
         RouterModule,
 
+        MatButtonModule,
         MatIconModule,
         MatMenuModule,
         MatProgressBarModule,