diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts
index b0bdc584..c5abfdc2 100644
--- a/src/app/navigation/navigation.ts
+++ b/src/app/navigation/navigation.ts
@@ -550,12 +550,6 @@ export const navigation: FuseNavigation[] = [
                                 title: 'Right Sidebar #4',
                                 type : 'item',
                                 url  : '/ui/page-layouts/simple/right-sidebar-4'
-                            },
-                            {
-                                id   : 'tabbed-1',
-                                title: 'Tabbed #1',
-                                type : 'item',
-                                url  : '/ui/page-layouts/simple/tabbed-1'
                             }
                         ]
                     },
@@ -577,284 +571,163 @@ export const navigation: FuseNavigation[] = [
         ]
     },
     {
-        id      : 'services',
-        title   : 'Services',
+        id      : 'angular-material-elements',
+        title   : 'Angular Material Elements',
         type    : 'group',
-        icon    : 'settings',
         children: [
             {
-                id   : 'config',
-                title: 'Config',
-                type : 'item',
-                icon : 'settings',
-                url  : '/services/config'
-            },
-            {
-                id   : 'splash-screen',
-                title: 'Splash Screen',
-                type : 'item',
-                icon : 'settings',
-                url  : '/services/splash-screen'
-            }
-        ]
-    },
-    {
-        id      : 'components',
-        title   : 'Components',
-        type    : 'group',
-        icon    : 'settings_input_component',
-        children: [
-            {
-                id      : 'angular-material-elements',
-                title   : 'Angular Material Elements',
+                id      : 'form-controls',
+                title   : 'Form Controls',
                 type    : 'collapsable',
                 icon    : 'layers',
                 children: [
                     {
-                        id      : 'form-controls',
-                        title   : 'Form Controls',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'autocomplete',
-                                title: 'Autocomplete',
-                                type : 'item',
-                                url  : '/components/angular-material/autocomplete'
-                            },
-                            {
-                                id   : 'checkbox',
-                                title: 'Checkbox',
-                                type : 'item',
-                                url  : '/components/angular-material/checkbox'
-                            },
-                            {
-                                id   : 'datepicker',
-                                title: 'Datepicker',
-                                type : 'item',
-                                url  : '/components/angular-material/datepicker'
-                            },
-                            {
-                                id   : 'form-field',
-                                title: 'Form field',
-                                type : 'item',
-                                url  : '/components/angular-material/form-field'
-                            },
-                            {
-                                id   : 'input',
-                                title: 'Input',
-                                type : 'item',
-                                url  : '/components/angular-material/input'
-                            },
-                            {
-                                id   : 'radio-button',
-                                title: 'Radio button',
-                                type : 'item',
-                                url  : '/components/angular-material/radio-button'
-                            },
-                            {
-                                id   : 'select',
-                                title: 'Select',
-                                type : 'item',
-                                url  : '/components/angular-material/select'
-                            },
-                            {
-                                id   : 'slider',
-                                title: 'Slider',
-                                type : 'item',
-                                url  : '/components/angular-material/slider'
-                            },
-                            {
-                                id   : 'slide-toggle',
-                                title: 'Slide toggle',
-                                type : 'item',
-                                url  : '/components/angular-material/slide-toggle'
-                            }
-                        ]
+                        id   : 'autocomplete',
+                        title: 'Autocomplete',
+                        type : 'item',
+                        url  : '/components/angular-material/autocomplete'
                     },
                     {
-                        id      : 'navigation',
-                        title   : 'Navigation',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'menu',
-                                title: 'Menu',
-                                type : 'item',
-                                url  : '/components/angular-material/menu'
-                            },
-                            {
-                                id   : 'sidenav',
-                                title: 'Sidebar',
-                                type : 'item',
-                                url  : '/components/angular-material/sidenav'
-                            },
-                            {
-                                id   : 'toolbar',
-                                title: 'Toolbar',
-                                type : 'item',
-                                url  : '/components/angular-material/toolbar'
-                            }
-                        ]
+                        id   : 'checkbox',
+                        title: 'Checkbox',
+                        type : 'item',
+                        url  : '/components/angular-material/checkbox'
                     },
                     {
-                        id      : 'layout',
-                        title   : 'Layout',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'badge',
-                                title: 'Badge',
-                                type : 'item',
-                                url  : '/components/angular-material/badge'
-                            },
-                            {
-                                id   : 'bottom-sheet',
-                                title: 'Bottom Sheet',
-                                type : 'item',
-                                url  : '/components/angular-material/bottom-sheet'
-                            },
-                            {
-                                id   : 'card',
-                                title: 'Card',
-                                type : 'item',
-                                url  : '/components/angular-material/card'
-                            },
-                            {
-                                id   : 'divider',
-                                title: 'Divider',
-                                type : 'item',
-                                url  : '/components/angular-material/divider'
-                            },
-                            {
-                                id   : 'elevation',
-                                title: 'Elevation',
-                                type : 'item',
-                                url  : '/components/angular-material/elevation'
-                            },
-                            {
-                                id   : 'expansion-panel',
-                                title: 'Expansion Panel',
-                                type : 'item',
-                                url  : '/components/angular-material/expansion-panel'
-                            },
-                            {
-                                id   : 'grid-list',
-                                title: 'Grid list',
-                                type : 'item',
-                                url  : '/components/angular-material/grid-list'
-                            },
-                            {
-                                id   : 'list',
-                                title: 'List',
-                                type : 'item',
-                                url  : '/components/angular-material/list'
-                            },
-                            {
-                                id   : 'stepper',
-                                title: 'Stepper',
-                                type : 'item',
-                                url  : '/components/angular-material/stepper'
-                            },
-                            {
-                                id   : 'tabs',
-                                title: 'Tabs',
-                                type : 'item',
-                                url  : '/components/angular-material/tabs'
-                            }
-                        ]
+                        id   : 'datepicker',
+                        title: 'Datepicker',
+                        type : 'item',
+                        url  : '/components/angular-material/datepicker'
                     },
                     {
-                        id      : 'buttons-indicators',
-                        title   : 'Buttons & Indicators',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'button',
-                                title: 'Button',
-                                type : 'item',
-                                url  : '/components/angular-material/button'
-                            },
-                            {
-                                id   : 'button-toggle',
-                                title: 'Button toggle',
-                                type : 'item',
-                                url  : '/components/angular-material/button-toggle'
-                            },
-                            {
-                                id   : 'chips',
-                                title: 'Chips',
-                                type : 'item',
-                                url  : '/components/angular-material/chips'
-                            },
-                            {
-                                id   : 'icon',
-                                title: 'icon',
-                                type : 'item',
-                                url  : '/components/angular-material/icon'
-                            },
-                            {
-                                id   : 'progress-spinner',
-                                title: 'Progress spinner',
-                                type : 'item',
-                                url  : '/components/angular-material/progress-spinner'
-                            },
-                            {
-                                id   : 'progress-bar',
-                                title: 'Progress bar',
-                                type : 'item',
-                                url  : '/components/angular-material/progress-bar'
-                            }
-                        ]
+                        id   : 'form-field',
+                        title: 'Form field',
+                        type : 'item',
+                        url  : '/components/angular-material/form-field'
                     },
                     {
-                        id      : 'popups-modals',
-                        title   : 'Popups & Modals',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'dialog',
-                                title: 'Dialog',
-                                type : 'item',
-                                url  : '/components/angular-material/dialog'
-                            },
-                            {
-                                id   : 'snackbar',
-                                title: 'Snackbar',
-                                type : 'item',
-                                url  : '/components/angular-material/snackbar'
-                            },
-                            {
-                                id   : 'tooltip',
-                                title: 'Tooltip',
-                                type : 'item',
-                                url  : '/components/angular-material/tooltip'
-                            }
-                        ]
+                        id   : 'input',
+                        title: 'Input',
+                        type : 'item',
+                        url  : '/components/angular-material/input'
                     },
                     {
-                        id      : 'data-table',
-                        title   : 'Data table',
-                        type    : 'group',
-                        children: [
-                            {
-                                id   : 'paginator',
-                                title: 'Paginator',
-                                type : 'item',
-                                url  : '/components/angular-material/paginator'
-                            },
-                            {
-                                id   : 'sort-header',
-                                title: 'Sort header',
-                                type : 'item',
-                                url  : '/components/angular-material/sort-header'
-                            },
-                            {
-                                id   : 'table',
-                                title: 'Table',
-                                type : 'item',
-                                url  : '/components/angular-material/table'
-                            }
-                        ]
+                        id   : 'radio-button',
+                        title: 'Radio button',
+                        type : 'item',
+                        url  : '/components/angular-material/radio-button'
+                    },
+                    {
+                        id   : 'select',
+                        title: 'Select',
+                        type : 'item',
+                        url  : '/components/angular-material/select'
+                    },
+                    {
+                        id   : 'slider',
+                        title: 'Slider',
+                        type : 'item',
+                        url  : '/components/angular-material/slider'
+                    },
+                    {
+                        id   : 'slide-toggle',
+                        title: 'Slide toggle',
+                        type : 'item',
+                        url  : '/components/angular-material/slide-toggle'
+                    }
+                ]
+            },
+            {
+                id      : 'navigation',
+                title   : 'Navigation',
+                type    : 'collapsable',
+                icon    : 'layers',
+                children: [
+                    {
+                        id   : 'menu',
+                        title: 'Menu',
+                        type : 'item',
+                        url  : '/components/angular-material/menu'
+                    },
+                    {
+                        id   : 'sidenav',
+                        title: 'Sidebar',
+                        type : 'item',
+                        url  : '/components/angular-material/sidenav'
+                    },
+                    {
+                        id   : 'toolbar',
+                        title: 'Toolbar',
+                        type : 'item',
+                        url  : '/components/angular-material/toolbar'
+                    }
+                ]
+            },
+            {
+                id      : 'layout',
+                title   : 'Layout',
+                type    : 'collapsable',
+                icon    : 'layers',
+                children: [
+                    {
+                        id   : 'badge',
+                        title: 'Badge',
+                        type : 'item',
+                        url  : '/components/angular-material/badge'
+                    },
+                    {
+                        id   : 'bottom-sheet',
+                        title: 'Bottom Sheet',
+                        type : 'item',
+                        url  : '/components/angular-material/bottom-sheet'
+                    },
+                    {
+                        id   : 'card',
+                        title: 'Card',
+                        type : 'item',
+                        url  : '/components/angular-material/card'
+                    },
+                    {
+                        id   : 'divider',
+                        title: 'Divider',
+                        type : 'item',
+                        url  : '/components/angular-material/divider'
+                    },
+                    {
+                        id   : 'elevation',
+                        title: 'Elevation',
+                        type : 'item',
+                        url  : '/components/angular-material/elevation'
+                    },
+                    {
+                        id   : 'expansion-panel',
+                        title: 'Expansion Panel',
+                        type : 'item',
+                        url  : '/components/angular-material/expansion-panel'
+                    },
+                    {
+                        id   : 'grid-list',
+                        title: 'Grid list',
+                        type : 'item',
+                        url  : '/components/angular-material/grid-list'
+                    },
+                    {
+                        id   : 'list',
+                        title: 'List',
+                        type : 'item',
+                        url  : '/components/angular-material/list'
+                    },
+                    {
+                        id   : 'stepper',
+                        title: 'Stepper',
+                        type : 'item',
+                        url  : '/components/angular-material/stepper'
+                    },
+                    {
+                        id   : 'tabs',
+                        title: 'Tabs',
+                        type : 'item',
+                        url  : '/components/angular-material/tabs'
                     },
                     {
                         id   : 'tree',
@@ -864,6 +737,110 @@ export const navigation: FuseNavigation[] = [
                     }
                 ]
             },
+            {
+                id      : 'buttons-indicators',
+                title   : 'Buttons & Indicators',
+                type    : 'collapsable',
+                icon    : 'layers',
+                children: [
+                    {
+                        id   : 'button',
+                        title: 'Button',
+                        type : 'item',
+                        url  : '/components/angular-material/button'
+                    },
+                    {
+                        id   : 'button-toggle',
+                        title: 'Button toggle',
+                        type : 'item',
+                        url  : '/components/angular-material/button-toggle'
+                    },
+                    {
+                        id   : 'chips',
+                        title: 'Chips',
+                        type : 'item',
+                        url  : '/components/angular-material/chips'
+                    },
+                    {
+                        id   : 'icon',
+                        title: 'icon',
+                        type : 'item',
+                        url  : '/components/angular-material/icon'
+                    },
+                    {
+                        id   : 'progress-spinner',
+                        title: 'Progress spinner',
+                        type : 'item',
+                        url  : '/components/angular-material/progress-spinner'
+                    },
+                    {
+                        id   : 'progress-bar',
+                        title: 'Progress bar',
+                        type : 'item',
+                        url  : '/components/angular-material/progress-bar'
+                    }
+                ]
+            },
+            {
+                id      : 'popups-modals',
+                title   : 'Popups & Modals',
+                type    : 'collapsable',
+                icon    : 'layers',
+                children: [
+                    {
+                        id   : 'dialog',
+                        title: 'Dialog',
+                        type : 'item',
+                        url  : '/components/angular-material/dialog'
+                    },
+                    {
+                        id   : 'snackbar',
+                        title: 'Snackbar',
+                        type : 'item',
+                        url  : '/components/angular-material/snackbar'
+                    },
+                    {
+                        id   : 'tooltip',
+                        title: 'Tooltip',
+                        type : 'item',
+                        url  : '/components/angular-material/tooltip'
+                    }
+                ]
+            },
+            {
+                id      : 'data-table',
+                title   : 'Data table',
+                type    : 'collapsable',
+                icon    : 'layers',
+                children: [
+                    {
+                        id   : 'paginator',
+                        title: 'Paginator',
+                        type : 'item',
+                        url  : '/components/angular-material/paginator'
+                    },
+                    {
+                        id   : 'sort-header',
+                        title: 'Sort header',
+                        type : 'item',
+                        url  : '/components/angular-material/sort-header'
+                    },
+                    {
+                        id   : 'table',
+                        title: 'Table',
+                        type : 'item',
+                        url  : '/components/angular-material/table'
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        id      : 'components',
+        title   : 'Components',
+        type    : 'group',
+        icon    : 'settings_input_component',
+        children: [
             {
                 id   : 'cards',
                 title: 'Cards',
@@ -964,5 +941,27 @@ export const navigation: FuseNavigation[] = [
                 url  : '/components-third-party/google-maps'
             }
         ]
+    },
+    {
+        id      : 'services',
+        title   : 'Services',
+        type    : 'group',
+        icon    : 'settings',
+        children: [
+            {
+                id   : 'config',
+                title: 'Config',
+                type : 'item',
+                icon : 'settings',
+                url  : '/services/config'
+            },
+            {
+                id   : 'splash-screen',
+                title: 'Splash Screen',
+                type : 'item',
+                icon : 'settings',
+                url  : '/services/splash-screen'
+            }
+        ]
     }
 ];