diff --git a/UI/WebServerResources/scss/core/typography.scss b/UI/WebServerResources/scss/core/typography.scss
index f9973541c..a113587cd 100644
--- a/UI/WebServerResources/scss/core/typography.scss
+++ b/UI/WebServerResources/scss/core/typography.scss
@@ -150,11 +150,11 @@ $sg-typo-scale: (
 ) !global;
 
 // todo: fix that
-@function sg-font-sizes($size-List: $sg-typo-scale, $prefix: '$sg-font-size') {
-  @for $n from 1 to length($size-List) {
-    @return '#{$prefix}-#{$n}: sp-to-px( nth($size-List, $n) )';
-  }
-}
+//@function sg-font-sizes($size-List: $sg-typo-scale, $prefix: '$sg-font-size') {
+//  @for $n from 1 to length($size-List) {
+//    @return '#{$prefix}-#{$n}: sp-to-px( nth($size-List, $n) )';
+//  }
+//}
 
 // Basic typographic sizes
 // ----------------------------------------------------------------------------
diff --git a/UI/WebServerResources/scss/core/variables.scss b/UI/WebServerResources/scss/core/variables.scss
index 73858ca8e..373f03e84 100644
--- a/UI/WebServerResources/scss/core/variables.scss
+++ b/UI/WebServerResources/scss/core/variables.scss
@@ -38,6 +38,8 @@ $caption-font-size-base:   rem(1.200) !default;
 // ------------------------------
 
 $baseline-grid:            8px !default;
+$layout-gutter-width:      ($baseline-grid * 2) !default;
+
 // shortcut aliases for $baseline-grid
 $bl:                       $baseline-grid;
 $line:                     $baseline-grid;
@@ -66,7 +68,6 @@ $layout-breakpoint-xs:     600px !default;
 $layout-breakpoint-sm:     960px !default;
 $layout-breakpoint-md:     1280px !default;
 $layout-breakpoint-lg:     1920px !default;
-$layout-gutter-width:      ($baseline-grid * 2) !default;
 
 // Margins
 $md-base-margin:           $layout-gutter-width;
@@ -102,7 +103,7 @@ $icon-size: rem(2.400) !default;
 $app-bar-height: $sg-md-grid-pitch;
 
 // Views widths
-$listView-width: grid-step(6);
+$listView-width:   grid-step(6);
 $detailView-width: grid-step(8);
 
 $toast-height: $baseline-grid * 3 !default;
@@ -144,7 +145,7 @@ $whiteframe-shadow-24dp: 0px 11px 15px -7px rgba(0, 0, 0, $shadow-key-umbra-opac
 
 $z-index-toast: 105 !default;
 $z-index-tooltip: 100 !default;
-$z-index-menu: 95 !default;
+$z-index-menu: 100 !default;
 $z-index-select: 90 !default;
 $z-index-dialog: 80 !default;
 $z-index-bottom-sheet: 70 !default;
diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss
index a5c0a87f6..837bede92 100755
--- a/UI/WebServerResources/scss/styles.scss
+++ b/UI/WebServerResources/scss/styles.scss
@@ -66,28 +66,6 @@
 // Inverse components
 @import 'components/timepicker/timepicker';
 
-// Theme
-//@import '../angular-material/src/components/bottomSheet/bottomSheet-theme';
-//@import '../angular-material/src/components/button/button-theme';
-//@import '../angular-material/src/components/card/card-theme';
-//@import '../angular-material/src/components/checkbox/checkbox-theme';
-//@import '../angular-material/src/components/content/content-theme';
-//@import '../angular-material/src/components/dialog/dialog-theme';
-//@import '../angular-material/src/components/divider/divider-theme';
-//@import '../angular-material/src/components/input/input-theme';
-//@import '../angular-material/src/components/progressCircular/progressCircular-theme';
-//@import '../angular-material/src/components/progressLinear/progressLinear-theme';
-//@import '../angular-material/src/components/radioButton/radio-button-theme';
-//@import '../angular-material/src/components/sidenav/sidenav-theme';
-//@import '../angular-material/src/components/slider/slider-theme';
-//@import '../angular-material/src/components/subheader/subheader-theme';
-//@import '../angular-material/src/components/switch/switch-theme';
-//@import '../angular-material/src/components/tabs/tabs-theme';
-//@import '../angular-material/src/components/textField/textField-theme';
-//@import '../angular-material/src/components/toast/toast-theme';
-//@import '../angular-material/src/components/toolbar/toolbar-theme';
-//@import '../angular-material/src/components/tooltip/tooltip-theme';
-
 // @import '../angular-material/src/core/style/color-palette';
 
 // COMPONENTS