diff --git a/src/styles/_fa.scss b/src/styles/_fa.scss
index aa74982..0207bd9 100644
--- a/src/styles/_fa.scss
+++ b/src/styles/_fa.scss
@@ -1,4 +1,4 @@
-$fa-font-path: "fa/fonts";
+$fa-font-path: 'fonts';
 $fa-css-prefix: fa;
 
 @import 'fa/solid';
diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
index 6c96390..96f9300 100644
--- a/src/styles/_fonts.scss
+++ b/src/styles/_fonts.scss
@@ -1,4 +1,4 @@
-/* Google Fonts - Ubuntu v15 - https://fonts.googleapis.com/css?family=Ubuntu:400,700&subset=latin-ext&display=swap */
+/* Google Fonts - Ubuntu v20 - https://fonts.googleapis.com/css?family=Ubuntu:400,700&subset=latin-ext&display=swap */
 
 /* cyrillic-ext */
 @font-face {
@@ -6,7 +6,7 @@
 	font-style: normal;
 	font-weight: 400;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgoKcg72j00.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCs6KVjbNBYlgoKcg72j00.woff2) format('woff2');
 	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
   }
   /* cyrillic */
@@ -15,8 +15,8 @@
 	font-style: normal;
 	font-weight: 400;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgoKew72j00.woff2) format('woff2');
-	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCs6KVjbNBYlgoKew72j00.woff2) format('woff2');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
   }
   /* greek-ext */
   @font-face {
@@ -24,7 +24,7 @@
 	font-style: normal;
 	font-weight: 400;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgoKcw72j00.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCs6KVjbNBYlgoKcw72j00.woff2) format('woff2');
 	unicode-range: U+1F00-1FFF;
   }
   /* greek */
@@ -33,7 +33,7 @@
 	font-style: normal;
 	font-weight: 400;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgoKfA72j00.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCs6KVjbNBYlgoKfA72j00.woff2) format('woff2');
 	unicode-range: U+0370-03FF;
   }
   /* latin-ext */
@@ -42,8 +42,8 @@
 	font-style: normal;
 	font-weight: 400;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgoKcQ72j00.woff2) format('woff2');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCs6KVjbNBYlgoKcQ72j00.woff2) format('woff2');
+	unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
   }
   /* latin */
   @font-face {
@@ -52,7 +52,7 @@
 	font-weight: 400;
 	font-display: swap;
 	src: url(fonts/4iCs6KVjbNBYlgoKfw72.woff2) format('woff2');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
   }
   /* cyrillic-ext */
   @font-face {
@@ -60,7 +60,7 @@
 	font-style: normal;
 	font-weight: 700;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCv6KVjbNBYlgoCxCvjvWyNL4U.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCxCvjvWyNL4U.woff2) format('woff2');
 	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
   }
   /* cyrillic */
@@ -69,8 +69,8 @@
 	font-style: normal;
 	font-weight: 700;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCv6KVjbNBYlgoCxCvjtGyNL4U.woff2) format('woff2');
-	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCxCvjtGyNL4U.woff2) format('woff2');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
   }
   /* greek-ext */
   @font-face {
@@ -78,7 +78,7 @@
 	font-style: normal;
 	font-weight: 700;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCv6KVjbNBYlgoCxCvjvGyNL4U.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCxCvjvGyNL4U.woff2) format('woff2');
 	unicode-range: U+1F00-1FFF;
   }
   /* greek */
@@ -87,7 +87,7 @@
 	font-style: normal;
 	font-weight: 700;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCv6KVjbNBYlgoCxCvjs2yNL4U.woff2) format('woff2');
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCxCvjs2yNL4U.woff2) format('woff2');
 	unicode-range: U+0370-03FF;
   }
   /* latin-ext */
@@ -96,8 +96,8 @@
 	font-style: normal;
 	font-weight: 700;
 	font-display: swap;
-	src: url(https://fonts.gstatic.com/s/ubuntu/v15/4iCv6KVjbNBYlgoCxCvjvmyNL4U.woff2) format('woff2');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+	src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCxCvjvmyNL4U.woff2) format('woff2');
+	unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
   }
   /* latin */
   @font-face {
@@ -106,5 +106,5 @@
 	font-weight: 700;
 	font-display: swap;
 	src: url(fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2) format('woff2');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
   }  
\ No newline at end of file
diff --git a/src/styles/_leaflet.scss b/src/styles/_leaflet.scss
index 157d3a1..34199b2 100644
--- a/src/styles/_leaflet.scss
+++ b/src/styles/_leaflet.scss
@@ -10,7 +10,7 @@ $stroke-width-height-focus: 2;
 $stroke-width-axis : 2;
 
 @import '../../node_modules/leaflet/dist/leaflet';
-@import 'leaflet/leaflet_heightgraph';
+@import '../../node_modules/leaflet.heightgraph/src/L.Control.Heightgraph.css';
 
 /* Leaflet fixes */
 .leaflet-container {
diff --git a/src/styles/_lightbox.scss b/src/styles/_lightbox.scss
index c467928..0f61bb4 100644
--- a/src/styles/_lightbox.scss
+++ b/src/styles/_lightbox.scss
@@ -1,4 +1,4 @@
-@import '../../node_modules/lightbox2/dist/css/lightbox.css';
+@import '../../node_modules/lightbox2/src/css/lightbox.css';
 
 @mixin lightbox-icon($icon) {
 	background: none;
diff --git a/src/styles/_mask_admin.scss b/src/styles/_page.admin.scss
similarity index 100%
rename from src/styles/_mask_admin.scss
rename to src/styles/_page.admin.scss
diff --git a/src/styles/_mask_project.scss b/src/styles/_page.project.scss
similarity index 100%
rename from src/styles/_mask_project.scss
rename to src/styles/_page.project.scss
diff --git a/src/styles/_mask_upload.scss b/src/styles/_page.upload.scss
similarity index 100%
rename from src/styles/_mask_upload.scss
rename to src/styles/_page.upload.scss
diff --git a/src/styles/fonts/4iCs6KVjbNBYlgoKfw72.woff2 b/src/styles/fonts/4iCs6KVjbNBYlgoKfw72.woff2
index a590b8a..8070e4f 100644
Binary files a/src/styles/fonts/4iCs6KVjbNBYlgoKfw72.woff2 and b/src/styles/fonts/4iCs6KVjbNBYlgoKfw72.woff2 differ
diff --git a/src/styles/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2 b/src/styles/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2
index e10142f..2c08bc6 100644
Binary files a/src/styles/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2 and b/src/styles/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2 differ
diff --git a/src/styles/leaflet/_leaflet_heightgraph.scss b/src/styles/leaflet/_leaflet_heightgraph.scss
deleted file mode 100644
index a3fa6e6..0000000
--- a/src/styles/leaflet/_leaflet_heightgraph.scss
+++ /dev/null
@@ -1,148 +0,0 @@
-.heightgraph-container {
-    background-color: rgba(250,250,250,.8);
-    border-radius: 10px;
-    display: none;
-    cursor: default;
-    user-select: none;
-}
-
-.heightgraph-toggle {
-    cursor: pointer;
-    box-shadow: 0 1px 7px rgba(0, 0, 0, .4);
-    border-radius: 5px;
-    width: 28px;
-    height: 28px;
-    background: #f8f8f9;
-    display: block;
-}
-
-.heightgraph-toggle-icon {
-    background: url(img/area-chart.svg) no-repeat center center;
-    background-size: 14px 14px;
-    width: 26px;
-    height: 26px;
-    position: absolute;
-}
-
-.heightgraph-close-icon {
-    background: url(img/remove.svg) no-repeat center center;
-    background-size: 14px 14px;
-    width: 26px;
-    height: 26px;
-    position: absolute;
-    right: 0;
-    display: none;
-    cursor: pointer;
-}
-
-.border-top {
-    fill: none;
-}
-
-.legend-hover {
-    cursor: pointer;
-}
-
-.legend-text {
-    fill: #000;
-    font-size: 10px;
-    cursor: pointer;
-}
-
-.tick, .tick text {
-    fill: #000;
-    pointer-events: none;
-}
-
-.axis .tick line {
-    visibility: hidden;
-    pointer-events: none;
-}
-
-.axis path {
-    stroke: black;
-    fill: none;
-    stroke-width: 2px;
-    shape-rendering: crispEdges;
-    pointer-events: none;
-}
-
-.focusbox {
-    display: none;
-    font-size: 10px;
-    fill: #000;
-    pointer-events: none;
-}
-
-.focusbox rect {
-    fill: rgba(255, 255, 255, 0.8);
-    stroke-width: 1px;
-    stroke: #888;
-    pointer-events: none;
-}
-
-.focusbox text {
-    font-size: 12px;
-}
-
-.focusLine line {
-    stroke-width: 1px;
-    stroke: rgb(20, 20, 20);
-    display: none;
-    cursor: default;
-    shape-rendering: crispEdges;
-}
-
-.height-focus.label rect {
-    fill: rgba(255, 255, 255, 0.5);
-    stroke-width: 1px;
-    stroke: #888;
-    pointer-events: none;
-    shape-rendering: crispEdges;
-}
-
-.height-focus.line {
-    stroke: rgb(20, 20, 20);
-    stroke-width: 1px;
-    shape-rendering: crispEdges;
-}
-
-.height-focus.circle {
-    stroke: #FFF;
-    stroke-width: 1px;
-}
-
-.mouse-height-box-text{
-    font-size: 12px;
-}
-
-.grid .tick {
-    pointer-events: none;
-}
-
-.grid .tick line {
-    stroke: #EEE;
-    stroke-width: 1px;
-    shape-rendering: crispEdges;
-}
-
-.grid path {
-    stroke-width: 0;
-    pointer-events: none;
-}
-
-.tspan {
-    font-weight: bold;
-}
-
-.select-symbol {
-    cursor: pointer;
-}
-
-.select-info {
-    cursor: default;
-}
-
-.lineSelection {
-    cursor: move;
-}
diff --git a/src/styles/spot.scss b/src/styles/spot.scss
index 1593a9a..13f3544 100755
--- a/src/styles/spot.scss
+++ b/src/styles/spot.scss
@@ -5,12 +5,11 @@
 /* Modules */
 @import 'fa';
 @import 'lightbox';
-@import 'simplebar';
 @import 'leaflet';
 
-/* Pages Specific CSS (masks) */
-@import 'mask_project';
-@import 'mask_upload';
-@import 'mask_admin';
+/* Pages Specific CSS */
+@import 'page.project';
+@import 'page.upload';
+@import 'page.admin';
 
 @import 'mobile';