diff --git a/src/assets/logo.svg b/src/assets/logo.svg
index 2aae527..53ce962 100644
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -1,68 +1,109 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 136.1 144.1" style="enable-background:new 0 0 136.1 144.1;" xml:space="preserve">
-<g>
-	<path d="M103.8,19.9l3.8-4.6l-6.9-4.8l-3.5,5.6c0,0-4.8-2.8-13.6-5c-8.8-2.2-13.3-1.8-13.3-1.8l0.1-3.4l2.6,0.2l1-4.9
-		c0,0-3.2-1.2-8.3-1.2c-4.2,0-8.3,1-8.3,1l0.5,5.1l3.7-0.3l0.1,4C36.1,12.5,1.1,32.2,0,74.2c-1,42,29.1,69.6,67.3,69.9
-		c33.8,0.3,69.2-23.1,68.8-66.2C135.7,39,109.1,23.2,103.8,19.9z M67.1,143.1c-35.8,0-67.9-28-66.2-68.4C2.7,31,38.6,12.9,62.5,10.3
-		L62,5.4l-3.6,0l0-4c0,0,2.8-1,7.3-0.9c5,0.1,7.3,1.1,7.3,1.1l-0.6,4l-2.8,0l0,4.4c0,0,4.3-0.4,13,1.6c8.8,2.1,14.7,5.3,14.7,5.3
-		l3.2-5.1l5.6,3.7l-3.3,4.5c5.2,3.3,31.6,19.4,32,58.2C135.4,118.4,103.2,143.1,67.1,143.1z"/>
-	<path d="M28.7,96.7l8,0.1l9.6,0.1l4.8,0c1.6,0,3.2,0,4.8,0c2.8,0,5.6-0.1,8.3-0.1c0.1,0.7,0.1,1.3,0.2,2l0.1,0c0-0.7,0-1.3,0-2
-		c0.3,0,0.7,0,1,0c-0.3,0-0.7-0.1-1-0.1c-0.1-5.6-0.3-11.2-0.4-16.8c0.2,0,0.3,0,0.5,0l0.1,1.9l0.3,2.8c0.2,1.9,0.4,3.8,0.6,5.7
-		c0.2,1.6,0.4,3.3,0.6,4.9c-0.3,0-0.5,0-0.8,0.1l0,0.1c0.3,0,0.6,0,0.8,0c0,0.2,0,0.3,0.1,0.5c0.1,0.9,0.3,1.9,0.4,2.8
-		c0,0.2,0.1,0.4,0.1,0.7c-0.6,0-1.1,0-1.7,0c-0.9,0-1.9,0-2.8,0.1c-0.9,0.1-1.9,0.1-2.8,0.3c-1.9,0.2-3.8,0.7-5.6,1.4
-		c-0.9,0.4-1.8,0.8-2.6,1.3c-0.4,0.3-0.8,0.5-1.2,0.8c-0.4,0.3-0.7,0.6-1,1l0.1,0.1c0.7-0.6,1.5-1.1,2.3-1.5c0.8-0.4,1.7-0.7,2.6-1
-		c1.8-0.5,3.6-0.9,5.4-1c2.5-0.2,4.9-0.4,7.4-0.4c0.1,0.3,0.1,0.7,0.2,1c-0.4,0.1-0.7,0.2-1.1,0.3c-1,0.3-2,0.6-3,1
-		c1-0.2,2-0.5,3-0.8c1-0.3,2-0.5,3-0.8c1.6,0.5,3.2,0.9,4.8,1.4l2.4,0.7l0.6,0.2c-0.6,0-1.2,0-1.8,0l-3.7,0c-1.2,0-2.4,0-3.7,0.1
-		c-1.2,0-2.4,0.1-3.7,0.1c1.2,0.1,2.4,0.1,3.7,0.1c1.2,0,2.4,0.1,3.7,0.1l3.7,0c1.2,0,2.4,0,3.7,0l1.9,0l-1.9-0.5l-2.4-0.7l-2.4-0.7
-		c-1.6-0.4-3.2-0.9-4.9-1.3l-0.1,0l0,0c-0.6,0.2-1.2,0.4-1.8,0.6c0-0.3,0-0.6-0.1-0.9c1.2,0,2.4,0,3.6,0.1c1.9,0.1,3.7,0.4,5.6,0.6
-		c1.8,0.3,3.7,0.7,5.5,1c3.7,0.7,7.4,1.4,11,2.2l0-0.1c-3.7-0.9-7.3-1.7-11-2.6c-1.8-0.4-3.7-0.8-5.5-1.2c-1.9-0.3-3.7-0.6-5.6-0.8
-		c-1.2-0.1-2.5-0.2-3.7-0.2c-0.1-1.3-0.2-2.6-0.3-4c1.4,0.1,2.8,0.2,4.2,0.2c1.9,0.1,3.7,0.1,5.6,0.1c3.7,0.1,7.5,0,11.2-0.1
-		c3.7,0,7.5-0.1,11.2-0.1l11.2-0.3l0-0.1l-11.2-0.1c-3.7,0-7.5-0.1-11.2-0.2L82,94.8l-2.8,0c-0.9,0-1.9,0-2.8,0
-		c-1.9,0-3.7,0.1-5.6,0.2c-1.4,0.1-2.8,0.1-4.2,0.2c-0.4-5.1-0.8-10.3-1.1-15.4c2.8-0.2,5.6-0.4,8.4-0.6l2.7-0.2l2.7-0.3
-		c1.8-0.2,3.6-0.3,5.5-0.5c3.6-0.3,7.3-0.5,11-0.5c2.5-0.1,5-0.1,7.5,0c0.5,1.9,0.9,3.9,1.4,5.8c0.8,3.5,1.5,7,2.1,10.6
-		c-0.6-5.5-1.6-10.9-2.8-16.3c0.9,0,1.9,0.1,2.8,0.1l0-0.1c-0.9-0.1-1.9-0.2-2.8-0.2c-0.3-1.6-0.7-3.1-1.1-4.7
-		c-1.3-5.2-2.7-10.3-4.3-15.3c0.5,0,0.9,0,1.4,0l0-0.1c-0.5,0-1,0-1.4-0.1c-0.6-1.8-1.1-3.5-1.8-5.3c-1.3-3.4-2.8-6.7-4.4-9.9
-		c-1.3-2.5-2.7-4.8-4.2-7.2c0.1,0,0.3,0,0.4,0l0-0.1c-0.2,0-0.3,0-0.5,0c-0.4-0.7-0.9-1.3-1.3-2c-2-3-4.2-5.8-6.6-8.6
-		c-1.2-1.4-2.4-2.7-3.6-4c-0.9-1-1.9-1.9-2.9-2.8c0.2,0,0.4,0,0.6,0l0-0.1c-0.3,0-0.5-0.1-0.8-0.1c-0.3-0.3-0.5-0.5-0.8-0.8
-		c0.2,0.2,0.5,0.5,0.7,0.7c-0.4-0.1-0.9-0.1-1.3-0.2c-0.7-0.1-1.5-0.2-2.2-0.2c-0.9-0.1-1.7-0.1-2.3,0c-0.4,0.1-0.9,0.1-1.3,0.3
-		c0.1-2.1,0.3-4.2,0.4-6.2l-0.1,0c-0.2,2.1-0.4,4.2-0.6,6.3c-0.2,0.1-0.4,0.1-0.6,0.2l0,0.1c0.2,0,0.4,0,0.6,0.1
-		c-0.5,5.3-0.9,10.7-1.3,16c-0.1,1.4-0.2,2.9-0.3,4.3c0,0-0.1,0-0.1,0c0.1-2.7,0.3-5.4,0.4-8.1c0.4-7.7,0.8-15.4,1.3-23l-0.1,0
-		c-0.6,7.7-1.2,15.3-1.7,23c-0.2,2.8-0.4,5.5-0.5,8.3c-0.1,0-0.2,0.1-0.4,0.1l0,0.1c0.1,0,0.2,0,0.3,0c-0.3,4.8-0.6,9.7-0.8,14.5
-		c-0.1,2.3-0.2,4.6-0.3,6.9c-0.3,0.1-0.5,0.1-0.8,0.2l0,0.1c0.3,0,0.5,0,0.8,0c0,1.5-0.1,3-0.1,4.4c0,1.9,0,3.8,0.1,5.8
-		c0,1.9,0.1,3.8,0.2,5.8c0.1,1.3,0.1,2.7,0.2,4c0,0-0.1,0-0.1,0l0,0.1c0,0,0.1,0,0.1,0c0.3,5.6,0.7,11.2,1.2,16.7
-		c-2.8-0.3-5.5-0.4-8.3-0.5c-1.6-0.1-3.2-0.1-4.8-0.2c-1.6,0-3.2-0.1-4.8-0.1c-1.6,0-3.2,0-4.8,0c-1.6,0-3.2,0-4.8,0.1
-		c-2.6,0.1-5.3,0.2-7.9,0.5c0.3-0.8,0.7-1.6,1-2.4c1.4-3.4,2.9-6.8,4.3-10.1c1.5-3.4,2.9-6.7,4.5-10.1c1.5-3.3,3.1-6.6,4.8-9.9
-		c1.7-3.3,3.3-6.5,5-9.8l5-9.8l5-9.8l2.5-4.9l1.2-2.5l1.2-2.5L62,27.1l-1.3,2.4L58,34.3c-1.8,3.2-3.5,6.4-5.3,9.7
-		c-1.8,3.2-3.5,6.5-5.2,9.7c-1.7,3.3-3.4,6.5-5.1,9.8c-3.4,6.6-6.3,13.3-9.1,20.1c-1.7,4.3-3.4,8.6-5,12.9c-0.4,0-0.8,0.1-1.3,0.1
-		l1.2,0c-0.9,2.5-1.9,5.1-2.8,7.6C26.6,101.7,27.6,99.2,28.7,96.7z M97.5,57.5c0.6,1.7,1.1,3.4,1.6,5.1c1.1,3.4,2,6.9,2.9,10.4
-		c0.4,1.5,0.8,3,1.1,4.4c-2.5-0.2-4.9-0.2-7.4-0.3c-3.7,0-7.3,0-11,0.2c-3.7,0.2-7.3,0.3-11,0.8c-1.8,0.2-3.6,0.5-5.5,0.7
-		c-1,0.2-1.9,0.3-2.9,0.5c0-0.2,0-0.3,0-0.5l-0.4-5.7l-0.3-5.7c-0.1-1.9-0.2-3.8-0.3-5.7c0-0.7-0.1-1.4-0.1-2.1
-		c0.7,0,1.5-0.1,2.2-0.1c1.6-0.1,3.2-0.2,4.8-0.4c3.2-0.3,6.3-0.7,9.5-1c3.2-0.3,6.3-0.5,9.5-0.6C92.8,57.5,95.1,57.5,97.5,57.5
-		C97.5,57.5,97.5,57.5,97.5,57.5z M65.2,33.5c0.3-5.3,0.7-10.7,1-16c0.4,0,0.8,0,1.2,0c0.7,0,1.6,0,2.3,0c0.7,0,1.5,0,2.2,0
-		c0.5,0,1,0,1.5,0c2.2,2.3,4.2,4.7,6.2,7.2c2.2,2.8,4.3,5.7,6.3,8.7c0.3,0.5,0.7,1,1,1.5c-1.6,0-3.2,0.1-4.8,0.1
-		c-1.1,0-2.1,0.1-3.2,0.1c-1.1,0.1-2.1,0.2-3.2,0.3c-1.1,0.1-2.1,0.3-3.2,0.4c-1.1,0.1-2.1,0.3-3.1,0.5c-1,0.2-2.1,0.5-3.1,0.7
-		c-0.5,0.1-0.9,0.3-1.4,0.4C65.1,36.2,65.2,34.9,65.2,33.5z M65,38.1c0.5-0.1,1.1-0.1,1.6-0.2c1.1-0.1,2.1-0.3,3.1-0.4
-		c2.1-0.3,4.1-0.9,6.2-1.2c1-0.2,2.1-0.3,3.1-0.5c1-0.1,2.1-0.2,3.2-0.3c1.6-0.1,3.3-0.3,4.9-0.4c1.5,2.5,3,5,4.3,7.5
-		c1.6,3.2,3.1,6.4,4.3,9.8c0.6,1.6,1.1,3.2,1.7,4.8c-2.3-0.1-4.7-0.1-7-0.2c-3.2,0-6.4,0.1-9.6,0.3c-3.2,0.2-6.4,0.4-9.6,0.8
-		c-1.6,0.2-3.2,0.4-4.7,0.7c-0.7,0.1-1.4,0.2-2.1,0.4c0-1,0-2,0-3C64.4,50.2,64.7,44.1,65,38.1z M64.4,38.2
-		C64.4,38.2,64.4,38.2,64.4,38.2c0,1.8-0.2,3.7-0.3,5.5C64.2,41.8,64.3,40,64.4,38.2z M63.6,58.5c0-0.2,0-0.3,0-0.5
-		c0,0.5,0,0.9,0,1.4c0,0,0,0,0,0C63.5,59.1,63.5,58.8,63.6,58.5z M63.9,75.8L63.7,70c-0.1-1.9-0.1-3.8-0.2-5.8c0-1.5,0-3,0-4.5
-		c0,0,0,0,0,0c0,0.7,0,1.4,0,2.1c0,1.9,0.1,3.8,0.2,5.7c0.1,1.9,0.1,3.8,0.2,5.7l0.2,2.8c0.1,0.9,0.1,1.9,0.2,2.8l0,0.6
-		c-0.1,0-0.3,0.1-0.4,0.1C63.9,78.4,63.9,77.1,63.9,75.8z"/>
-	<path d="M105.2,96.6l-12.5-0.1c-4.2-0.1-8.3-0.2-12.5-0.3L67.8,96l0,0.1c2.1,0.2,4.1,0.4,6.2,0.6c2.1,0.2,4.2,0.3,6.2,0.4
-		c4.2,0.2,8.3,0.2,12.5,0.2l12.5-0.1l12.5-0.2v-0.1L105.2,96.6z"/>
-	<path d="M102.2,110.3c-3.4,0.9-6.9,1.7-10.4,2.5c-6.9,1.6-13.9,3.2-20.8,4.6c-7,1.5-13.9,2.7-20.9,4c-3.5,0.6-7,1.2-10.5,1.7
-		c-1.8,0.3-3.5,0.5-5.3,0.7c-1.4,0.2-2.9,0.3-4.3,0.5c-0.3-1.5-0.7-3-1-4.4c-0.4-1.7-0.9-3.4-1.3-5l-1.4-5c-0.5-1.6-0.9-3.3-1.5-4.9
-		c1.4,0.1,2.7,0.1,4.1,0.1l5.6,0.1c3.7,0.1,7.4,0.1,11.2,0.2c7.4,0.1,14.9-0.1,22.3-0.1c7.4-0.1,14.9-0.1,22.3,0
-		c7.4,0,14.9,0.1,22.3,0.2l0-0.1c-7.4-0.2-14.9-0.4-22.3-0.6c-7.4-0.1-14.9-0.3-22.3-0.3c-7.4,0-14.9-0.1-22.3-0.1
-		c-3.7,0-7.4,0.1-11.2,0.1l-5.6,0.1c-1.9,0.1-3.7,0.1-5.6,0.2l0,0.1c0.5,0,1,0,1.5,0.1c0.1,1.7,0.4,3.4,0.7,5.1
-		c0.3,1.7,0.7,3.4,1.2,5.1c0.5,1.7,1,3.3,1.6,5c0.5,1.4,1.1,2.8,1.7,4.2c-0.3,0-0.6,0.1-0.9,0.1l0,0.1c0.3,0,0.6,0,0.9,0
-		c0.1,0.2,0.1,0.3,0.2,0.5c0-0.2-0.1-0.3-0.1-0.5c3.2,0,6.4-0.3,9.6-0.6c3.5-0.4,7.1-0.9,10.6-1.4c7-1.1,14-2.6,20.9-4.2
-		c6.9-1.6,13.9-3.2,20.7-5c3.4-0.9,6.9-1.8,10.3-2.7c3.4-0.9,6.9-1.9,10.2-3l0-0.1C109.1,108.5,105.7,109.4,102.2,110.3z"/>
-	<path d="M68.9,106.8L58.8,107l-5.1,0.1l-5.1,0.2c-3.4,0.1-6.7,0.3-10.1,0.4l-5.1,0.3c-1.7,0.1-3.4,0.2-5.1,0.3l0,0.1
-		c1.7,0,3.4,0,5.1,0.1l5.1,0c3.4,0,6.7-0.1,10.1-0.1c6.7-0.1,13.5-0.4,20.2-0.7c6.7-0.3,13.5-0.6,20.2-0.8l20.2-0.8l0-0.1l-20.2,0.4
-		C82.4,106.4,75.6,106.6,68.9,106.8z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 136.1 177.6" style="enable-background:new 0 0 136.1 177.6;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M103.8,19.9l3.8-4.6l-6.9-4.8l-3.5,5.6c0,0-4.8-2.8-13.6-5S70.3,9.3,70.3,9.3l0.1-3.4L73,6.1l1-4.9
+		c0,0-3.2-1.2-8.3-1.2c-4.2,0-8.3,1-8.3,1l0.5,5.1l3.7-0.3l0.1,4C36.1,12.5,1.1,32.2,0,74.2c-1,42,29.1,69.6,67.3,69.9
+		c33.8,0.3,69.2-23.1,68.8-66.2C135.7,39,109.1,23.2,103.8,19.9z M67.1,143.1c-35.8,0-67.9-28-66.2-68.4C2.7,31,38.6,12.9,62.5,10.3
+		L62,5.4h-3.6v-4c0,0,2.8-1,7.3-0.9c5,0.1,7.3,1.1,7.3,1.1l-0.6,4h-2.8V10c0,0,4.3-0.4,13,1.6c8.8,2.1,14.7,5.3,14.7,5.3l3.2-5.1
+		l5.6,3.7l-3.3,4.5c5.2,3.3,31.6,19.4,32,58.2C135.4,118.4,103.2,143.1,67.1,143.1z"/>
+	<path class="st0" d="M28.7,96.7l8,0.1l9.6,0.1h4.8c1.6,0,3.2,0,4.8,0c2.8,0,5.6-0.1,8.3-0.1c0.1,0.7,0.1,1.3,0.2,2h0.1
+		c0-0.7,0-1.3,0-2c0.3,0,0.7,0,1,0c-0.3,0-0.7-0.1-1-0.1c-0.1-5.6-0.3-11.2-0.4-16.8c0.2,0,0.3,0,0.5,0l0.1,1.9l0.3,2.8
+		c0.2,1.9,0.4,3.8,0.6,5.7c0.2,1.6,0.4,3.3,0.6,4.9c-0.3,0-0.5,0-0.8,0.1v0.1c0.3,0,0.6,0,0.8,0c0,0.2,0,0.3,0.1,0.5
+		c0.1,0.9,0.3,1.9,0.4,2.8c0,0.2,0.1,0.4,0.1,0.7c-0.6,0-1.1,0-1.7,0c-0.9,0-1.9,0-2.8,0.1c-0.9,0.1-1.9,0.1-2.8,0.3
+		c-1.9,0.2-3.8,0.7-5.6,1.4c-0.9,0.4-1.8,0.8-2.6,1.3c-0.4,0.3-0.8,0.5-1.2,0.8s-0.7,0.6-1,1l0.1,0.1c0.7-0.6,1.5-1.1,2.3-1.5
+		s1.7-0.7,2.6-1c1.8-0.5,3.6-0.9,5.4-1c2.5-0.2,4.9-0.4,7.4-0.4c0.1,0.3,0.1,0.7,0.2,1c-0.4,0.1-0.7,0.2-1.1,0.3c-1,0.3-2,0.6-3,1
+		c1-0.2,2-0.5,3-0.8s2-0.5,3-0.8c1.6,0.5,3.2,0.9,4.8,1.4l2.4,0.7l0.6,0.2c-0.6,0-1.2,0-1.8,0h-3.7c-1.2,0-2.4,0-3.7,0.1
+		c-1.2,0-2.4,0.1-3.7,0.1c1.2,0.1,2.4,0.1,3.7,0.1c1.2,0,2.4,0.1,3.7,0.1H75c1.2,0,2.4,0,3.7,0h1.9l-1.9-0.5l-2.4-0.7l-2.4-0.7
+		c-1.6-0.4-3.2-0.9-4.9-1.3h-0.1l0,0c-0.6,0.2-1.2,0.4-1.8,0.6c0-0.3,0-0.6-0.1-0.9c1.2,0,2.4,0,3.6,0.1c1.9,0.1,3.7,0.4,5.6,0.6
+		c1.8,0.3,3.7,0.7,5.5,1c3.7,0.7,7.4,1.4,11,2.2v-0.1c-3.7-0.9-7.3-1.7-11-2.6c-1.8-0.4-3.7-0.8-5.5-1.2c-1.9-0.3-3.7-0.6-5.6-0.8
+		c-1.2-0.1-2.5-0.2-3.7-0.2c-0.1-1.3-0.2-2.6-0.3-4c1.4,0.1,2.8,0.2,4.2,0.2c1.9,0.1,3.7,0.1,5.6,0.1c3.7,0.1,7.5,0,11.2-0.1
+		c3.7,0,7.5-0.1,11.2-0.1l11.2-0.3v-0.1L98.8,95c-3.7,0-7.5-0.1-11.2-0.2l-5.6,0h-2.8c-0.9,0-1.9,0-2.8,0c-1.9,0-3.7,0.1-5.6,0.2
+		c-1.4,0.1-2.8,0.1-4.2,0.2c-0.4-5.1-0.8-10.3-1.1-15.4c2.8-0.2,5.6-0.4,8.4-0.6l2.7-0.2l2.7-0.3c1.8-0.2,3.6-0.3,5.5-0.5
+		c3.6-0.3,7.3-0.5,11-0.5c2.5-0.1,5-0.1,7.5,0c0.5,1.9,0.9,3.9,1.4,5.8c0.8,3.5,1.5,7,2.1,10.6c-0.6-5.5-1.6-10.9-2.8-16.3
+		c0.9,0,1.9,0.1,2.8,0.1v-0.1c-0.9-0.1-1.9-0.2-2.8-0.2c-0.3-1.6-0.7-3.1-1.1-4.7c-1.3-5.2-2.7-10.3-4.3-15.3c0.5,0,0.9,0,1.4,0
+		v-0.1c-0.5,0-1,0-1.4-0.1c-0.6-1.8-1.1-3.5-1.8-5.3c-1.3-3.4-2.8-6.7-4.4-9.9c-1.3-2.5-2.7-4.8-4.2-7.2c0.1,0,0.3,0,0.4,0v-0.1
+		c-0.2,0-0.3,0-0.5,0c-0.4-0.7-0.9-1.3-1.3-2c-2-3-4.2-5.8-6.6-8.6c-1.2-1.4-2.4-2.7-3.6-4c-0.9-1-1.9-1.9-2.9-2.8
+		c0.2,0,0.4,0,0.6,0v-0.1c-0.3,0-0.5-0.1-0.8-0.1c-0.3-0.3-0.5-0.5-0.8-0.8c0.2,0.2,0.5,0.5,0.7,0.7c-0.4-0.1-0.9-0.1-1.3-0.2
+		c-0.7-0.1-1.5-0.2-2.2-0.2c-0.9-0.1-1.7-0.1-2.3,0c-0.4,0.1-0.9,0.1-1.3,0.3c0.1-2.1,0.3-4.2,0.4-6.2h-0.1
+		c-0.2,2.1-0.4,4.2-0.6,6.3c-0.2,0.1-0.4,0.1-0.6,0.2v0.1c0.2,0,0.4,0,0.6,0.1c-0.5,5.3-0.9,10.7-1.3,16c-0.1,1.4-0.2,2.9-0.3,4.3
+		h-0.1c0.1-2.7,0.3-5.4,0.4-8.1c0.4-7.7,0.8-15.4,1.3-23h-0.1c-0.6,7.7-1.2,15.3-1.7,23c-0.2,2.8-0.4,5.5-0.5,8.3
+		c-0.1,0-0.2,0.1-0.4,0.1v0.1c0.1,0,0.2,0,0.3,0c-0.3,4.8-0.6,9.7-0.8,14.5c-0.1,2.3-0.2,4.6-0.3,6.9c-0.3,0.1-0.5,0.1-0.8,0.2V60
+		c0.3,0,0.5,0,0.8,0c0,1.5-0.1,3-0.1,4.4c0,1.9,0,3.8,0.1,5.8c0,1.9,0.1,3.8,0.2,5.8c0.1,1.3,0.1,2.7,0.2,4h-0.1v0.1h0.1
+		c0.3,5.6,0.7,11.2,1.2,16.7c-2.8-0.3-5.5-0.4-8.3-0.5c-1.6-0.1-3.2-0.1-4.8-0.2c-1.6,0-3.2-0.1-4.8-0.1s-3.2,0-4.8,0
+		s-3.2,0-4.8,0.1C34,96.2,31.3,96.3,28.7,96.7c0.3-0.9,0.7-1.7,1-2.5c1.4-3.4,2.9-6.8,4.3-10.1c1.5-3.4,2.9-6.7,4.5-10.1
+		c1.5-3.3,3.1-6.6,4.8-9.9c1.7-3.3,3.3-6.5,5-9.8l5-9.8l5-9.8l2.5-4.9l1.2-2.5l1.2-2.5L62,27.1l-1.3,2.4L58,34.3
+		c-1.8,3.2-3.5,6.4-5.3,9.7c-1.8,3.2-3.5,6.5-5.2,9.7c-1.7,3.3-3.4,6.5-5.1,9.8c-3.4,6.6-6.3,13.3-9.1,20.1c-1.7,4.3-3.4,8.6-5,12.9
+		c-0.4,0-0.8,0.1-1.3,0.1h1.2c-0.9,2.5-1.9,5.1-2.8,7.6C26.6,101.7,27.6,99.2,28.7,96.7z M97.5,57.5c0.6,1.7,1.1,3.4,1.6,5.1
+		c1.1,3.4,2,6.9,2.9,10.4c0.4,1.5,0.8,3,1.1,4.4c-2.5-0.2-4.9-0.2-7.4-0.3c-3.7,0-7.3,0-11,0.2s-7.3,0.3-11,0.8
+		c-1.8,0.2-3.6,0.5-5.5,0.7c-1,0.2-1.9,0.3-2.9,0.5c0-0.2,0-0.3,0-0.5l-0.4-5.7l-0.3-5.7c-0.1-1.9-0.2-3.8-0.3-5.7
+		c0-0.7-0.1-1.4-0.1-2.1c0.7,0,1.5-0.1,2.2-0.1c1.6-0.1,3.2-0.2,4.8-0.4c3.2-0.3,6.3-0.7,9.5-1s6.3-0.5,9.5-0.6
+		C92.8,57.5,95.1,57.5,97.5,57.5L97.5,57.5z M65.2,33.5c0.3-5.3,0.7-10.7,1-16c0.4,0,0.8,0,1.2,0c0.7,0,1.6,0,2.3,0
+		c0.7,0,1.5,0,2.2,0c0.5,0,1,0,1.5,0c2.2,2.3,4.2,4.7,6.2,7.2c2.2,2.8,4.3,5.7,6.3,8.7c0.3,0.5,0.7,1,1,1.5c-1.6,0-3.2,0.1-4.8,0.1
+		c-1.1,0-2.1,0.1-3.2,0.1c-1.1,0.1-2.1,0.2-3.2,0.3s-2.1,0.3-3.2,0.4c-1.1,0.1-2.1,0.3-3.1,0.5s-2.1,0.5-3.1,0.7
+		c-0.5,0.1-0.9,0.3-1.4,0.4C65.1,36.2,65.2,34.9,65.2,33.5z M65,38.1c0.5-0.1,1.1-0.1,1.6-0.2c1.1-0.1,2.1-0.3,3.1-0.4
+		c2.1-0.3,4.1-0.9,6.2-1.2c1-0.2,2.1-0.3,3.1-0.5c1-0.1,2.1-0.2,3.2-0.3c1.6-0.1,3.3-0.3,4.9-0.4c1.5,2.5,3,5,4.3,7.5
+		c1.6,3.2,3.1,6.4,4.3,9.8c0.6,1.6,1.1,3.2,1.7,4.8c-2.3-0.1-4.7-0.1-7-0.2c-3.2,0-6.4,0.1-9.6,0.3s-6.4,0.4-9.6,0.8
+		c-1.6,0.2-3.2,0.4-4.7,0.7c-0.7,0.1-1.4,0.2-2.1,0.4c0-1,0-2,0-3C64.4,50.2,64.7,44.1,65,38.1z M64.4,38.2L64.4,38.2
+		c0,1.8-0.2,3.7-0.3,5.5C64.2,41.8,64.3,40,64.4,38.2z M63.6,58.5c0-0.2,0-0.3,0-0.5c0,0.5,0,0.9,0,1.4l0,0
+		C63.5,59.1,63.5,58.8,63.6,58.5z M63.9,75.8L63.7,70c-0.1-1.9-0.1-3.8-0.2-5.8c0-1.5,0-3,0-4.5l0,0c0,0.7,0,1.4,0,2.1
+		c0,1.9,0.1,3.8,0.2,5.7c0.1,1.9,0.1,3.8,0.2,5.7l0.2,2.8c0.1,0.9,0.1,1.9,0.2,2.8v0.6c-0.1,0-0.3,0.1-0.4,0.1
+		C63.9,78.4,63.9,77.1,63.9,75.8z"/>
+	<path class="st0" d="M105.2,96.6l-12.5-0.1c-4.2-0.1-8.3-0.2-12.5-0.3L67.8,96v0.1c2.1,0.2,4.1,0.4,6.2,0.6s4.2,0.3,6.2,0.4
+		c4.2,0.2,8.3,0.2,12.5,0.2l12.5-0.1l12.5-0.2v-0.1L105.2,96.6z"/>
+	<path class="st0" d="M102.2,110.3c-3.4,0.9-6.9,1.7-10.4,2.5c-6.9,1.6-13.9,3.2-20.8,4.6c-7,1.5-13.9,2.7-20.9,4
+		c-3.5,0.6-7,1.2-10.5,1.7c-1.8,0.3-3.5,0.5-5.3,0.7c-1.4,0.2-2.9,0.3-4.3,0.5c-0.3-1.5-0.7-3-1-4.4c-0.4-1.7-0.9-3.4-1.3-5l-1.4-5
+		c-0.5-1.6-0.9-3.3-1.5-4.9c1.4,0.1,2.7,0.1,4.1,0.1l5.6,0.1c3.7,0.1,7.4,0.1,11.2,0.2c7.4,0.1,14.9-0.1,22.3-0.1
+		c7.4-0.1,14.9-0.1,22.3,0c7.4,0,14.9,0.1,22.3,0.2v-0.1c-7.4-0.2-14.9-0.4-22.3-0.6c-7.4-0.1-14.9-0.3-22.3-0.3s-14.9-0.1-22.3-0.1
+		c-3.7,0-7.4,0.1-11.2,0.1l-5.6,0.1c-1.9,0.1-3.7,0.1-5.6,0.2v0.1c0.5,0,1,0,1.5,0.1c0.1,1.7,0.4,3.4,0.7,5.1
+		c0.3,1.7,0.7,3.4,1.2,5.1s1,3.3,1.6,5c0.5,1.4,1.1,2.8,1.7,4.2c-0.3,0-0.6,0.1-0.9,0.1v0.1c0.3,0,0.6,0,0.9,0
+		c0.1,0.2,0.1,0.3,0.2,0.5c0-0.2-0.1-0.3-0.1-0.5c3.2,0,6.4-0.3,9.6-0.6c3.5-0.4,7.1-0.9,10.6-1.4c7-1.1,14-2.6,20.9-4.2
+		s13.9-3.2,20.7-5c3.4-0.9,6.9-1.8,10.3-2.7c3.4-0.9,6.9-1.9,10.2-3v-0.1C109.1,108.5,105.7,109.4,102.2,110.3z"/>
+	<path class="st0" d="M68.9,106.8L58.8,107l-5.1,0.1l-5.1,0.2c-3.4,0.1-6.7,0.3-10.1,0.4l-5.1,0.3c-1.7,0.1-3.4,0.2-5.1,0.3v0.1
+		c1.7,0,3.4,0,5.1,0.1h5.1c3.4,0,6.7-0.1,10.1-0.1c6.7-0.1,13.5-0.4,20.2-0.7c6.7-0.3,13.5-0.6,20.2-0.8l20.2-0.8V106L89,106.4
+		C82.4,106.4,75.6,106.6,68.9,106.8z"/>
+</g>
+<g>
+	<path class="st0" d="M41.4,159H38v3.5h-1.8V154h5.6v1.4H38v2.2h3.4V159z"/>
+	<path class="st0" d="M44.5,162.5h-1.7v-9h1.7V162.5z"/>
+	<path class="st0" d="M48.8,162.6c-0.9,0-1.7-0.3-2.3-0.9s-0.9-1.3-0.9-2.3v-0.2c0-0.6,0.1-1.2,0.4-1.7s0.6-0.9,1-1.2s1-0.4,1.5-0.4
+		c0.9,0,1.5,0.3,2,0.8s0.7,1.3,0.7,2.3v0.7h-4c0.1,0.4,0.2,0.7,0.5,1s0.6,0.4,1,0.4c0.7,0,1.2-0.2,1.5-0.7l0.8,0.9
+		c-0.3,0.4-0.6,0.6-1,0.8S49.3,162.6,48.8,162.6z M48.6,157.4c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.6-0.4,1h2.4v-0.1
+		c0-0.4-0.1-0.7-0.3-0.9S49,157.4,48.6,157.4z"/>
+	<path class="st0" d="M55.3,162.6c-0.9,0-1.7-0.3-2.3-0.9s-0.9-1.3-0.9-2.3v-0.2c0-0.6,0.1-1.2,0.4-1.7s0.6-0.9,1-1.2s1-0.4,1.5-0.4
+		c0.9,0,1.5,0.3,2,0.8s0.7,1.3,0.7,2.3v0.7h-4c0.1,0.4,0.2,0.7,0.5,1s0.6,0.4,1,0.4c0.7,0,1.2-0.2,1.5-0.7l0.8,0.9
+		c-0.3,0.4-0.6,0.6-1,0.8S55.8,162.6,55.3,162.6z M55.1,157.4c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.6-0.4,1h2.4v-0.1
+		c0-0.4-0.1-0.7-0.3-0.9S55.4,157.4,55.1,157.4z"/>
+	<path class="st0" d="M60.9,154.6v1.6H62v1.2h-1.1v3.2c0,0.2,0,0.4,0.1,0.5s0.3,0.2,0.5,0.2c0.2,0,0.4,0,0.5,0v1.3
+		c-0.3,0.1-0.7,0.2-1,0.2c-1.2,0-1.8-0.6-1.8-1.8v-3.4h-0.9v-1.2h0.9v-1.6H60.9z"/>
+	<path class="st0" d="M70.4,160.3c0-0.3-0.1-0.6-0.4-0.8s-0.7-0.4-1.3-0.6s-1.1-0.4-1.4-0.6c-1-0.5-1.5-1.2-1.5-2.1
+		c0-0.5,0.1-0.9,0.4-1.2s0.6-0.6,1.1-0.8s1-0.3,1.6-0.3c0.6,0,1.2,0.1,1.6,0.3s0.8,0.5,1.1,0.9s0.4,0.9,0.4,1.4h-1.8
+		c0-0.4-0.1-0.7-0.4-0.9s-0.6-0.3-1-0.3c-0.4,0-0.8,0.1-1,0.3s-0.4,0.4-0.4,0.7c0,0.3,0.1,0.5,0.4,0.7s0.7,0.4,1.2,0.5
+		c1,0.3,1.7,0.7,2.2,1.1s0.7,1,0.7,1.7c0,0.7-0.3,1.3-0.8,1.7s-1.3,0.6-2.3,0.6c-0.7,0-1.3-0.1-1.8-0.4s-1-0.6-1.2-1
+		s-0.4-0.9-0.4-1.5h1.8c0,0.9,0.6,1.4,1.7,1.4c0.4,0,0.7-0.1,1-0.3S70.4,160.6,70.4,160.3z"/>
+	<path class="st0" d="M75.9,161.3c0.3,0,0.6-0.1,0.8-0.3s0.3-0.4,0.3-0.7h1.6c0,0.4-0.1,0.8-0.4,1.2s-0.5,0.6-0.9,0.8
+		s-0.8,0.3-1.3,0.3c-0.9,0-1.6-0.3-2.1-0.9s-0.8-1.4-0.8-2.4v-0.1c0-1,0.3-1.8,0.8-2.3s1.2-0.9,2.1-0.9c0.8,0,1.4,0.2,1.9,0.7
+		s0.7,1.1,0.7,1.8H77c0-0.3-0.1-0.6-0.3-0.8s-0.5-0.3-0.8-0.3c-0.4,0-0.7,0.1-0.9,0.4c-0.2,0.3-0.3,0.8-0.3,1.4v0.2
+		c0,0.7,0.1,1.1,0.3,1.4C75.2,161.1,75.5,161.3,75.9,161.3z"/>
+	<path class="st0" d="M79.5,154.5c0-0.3,0.1-0.5,0.3-0.6s0.4-0.2,0.7-0.2c0.3,0,0.5,0.1,0.7,0.2s0.3,0.4,0.3,0.6
+		c0,0.3-0.1,0.5-0.3,0.6s-0.4,0.2-0.7,0.2s-0.5-0.1-0.7-0.2S79.5,154.8,79.5,154.5z M81.3,162.5h-1.7v-6.3h1.7V162.5z"/>
+	<path class="st0" d="M85.6,162.6c-0.9,0-1.7-0.3-2.3-0.9s-0.9-1.3-0.9-2.3v-0.2c0-0.6,0.1-1.2,0.4-1.7s0.6-0.9,1-1.2s1-0.4,1.5-0.4
+		c0.9,0,1.5,0.3,2,0.8s0.7,1.3,0.7,2.3v0.7h-4c0.1,0.4,0.2,0.7,0.5,1s0.6,0.4,1,0.4c0.7,0,1.2-0.2,1.5-0.7l0.8,0.9
+		c-0.3,0.4-0.6,0.6-1,0.8S86.1,162.6,85.6,162.6z M85.4,157.4c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.6-0.4,1h2.4v-0.1
+		c0-0.4-0.1-0.7-0.3-0.9S85.8,157.4,85.4,157.4z"/>
+	<path class="st0" d="M90.7,156.2l0.1,0.7c0.5-0.6,1.1-0.8,1.8-0.8c0.7,0,1.2,0.2,1.5,0.6s0.5,1,0.5,1.8v4.1h-1.7v-4.1
+		c0-0.4-0.1-0.6-0.2-0.8s-0.4-0.2-0.8-0.2c-0.5,0-0.8,0.2-1.1,0.6v4.5h-1.7v-6.3H90.7z"/>
+	<path class="st0" d="M98.5,161.3c0.3,0,0.6-0.1,0.8-0.3s0.3-0.4,0.3-0.7h1.6c0,0.4-0.1,0.8-0.4,1.2s-0.5,0.6-0.9,0.8
+		s-0.8,0.3-1.3,0.3c-0.9,0-1.6-0.3-2.1-0.9s-0.8-1.4-0.8-2.4v-0.1c0-1,0.3-1.8,0.8-2.3s1.2-0.9,2.1-0.9c0.8,0,1.4,0.2,1.9,0.7
+		s0.7,1.1,0.7,1.8h-1.6c0-0.3-0.1-0.6-0.3-0.8s-0.5-0.3-0.8-0.3c-0.4,0-0.7,0.1-0.9,0.4c-0.2,0.3-0.3,0.8-0.3,1.4v0.2
+		c0,0.7,0.1,1.1,0.3,1.4C97.8,161.1,98.1,161.3,98.5,161.3z"/>
+	<path class="st0" d="M105.1,162.6c-0.9,0-1.7-0.3-2.3-0.9s-0.9-1.3-0.9-2.3v-0.2c0-0.6,0.1-1.2,0.4-1.7s0.6-0.9,1-1.2
+		s1-0.4,1.5-0.4c0.9,0,1.5,0.3,2,0.8s0.7,1.3,0.7,2.3v0.7h-4c0.1,0.4,0.2,0.7,0.5,1s0.6,0.4,1,0.4c0.7,0,1.2-0.2,1.5-0.7l0.8,0.9
+		c-0.3,0.4-0.6,0.6-1,0.8S105.6,162.6,105.1,162.6z M104.9,157.4c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.6-0.4,1h2.4v-0.1
+		c0-0.4-0.1-0.7-0.3-0.9S105.3,157.4,104.9,157.4z"/>
+</g>
+</svg>
diff --git a/src/assets/white/arrow.svg b/src/assets/white/arrow.svg
new file mode 100644
index 0000000..be8d6f6
--- /dev/null
+++ b/src/assets/white/arrow.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<polygon class="st0" points="47.6,64 10.3,32 47.6,0 53.7,7.2 24.8,32 53.7,56.8 	"/>
+</g>
+</svg>
diff --git a/src/components/addButton/style.scss b/src/components/addButton/style.scss
index 2c63667..8bca6a0 100644
--- a/src/components/addButton/style.scss
+++ b/src/components/addButton/style.scss
@@ -20,6 +20,6 @@
   }
 
   img {
-    opacity: .6;
+    opacity: .8;
   }
 }
diff --git a/src/components/editLink/index.js b/src/components/editLink/index.js
index 44d0a70..7d672d1 100644
--- a/src/components/editLink/index.js
+++ b/src/components/editLink/index.js
@@ -8,13 +8,12 @@ export default class EditLink extends Component {
   render() {
     return (
       <Link class={style.edit} href={this.props.to}>
-        Edit {this.props.type} <i class="material-icons">mode_edit</i>
+        Edit <i class="material-icons">mode_edit</i>
       </Link>
     );
   }
 }
 
 EditLink.propTypes = {
-  type: PropTypes.string.isRequired,
   to: PropTypes.string.isRequired,
 };
diff --git a/src/components/editLink/style.scss b/src/components/editLink/style.scss
index 2e33248..a1a1855 100644
--- a/src/components/editLink/style.scss
+++ b/src/components/editLink/style.scss
@@ -1,11 +1,17 @@
 .edit {
   align-items: center;
-  color: var(--main-color);
+  background: var(--main-color);
+  border: 0;
+  color: var(--main-bg-color);
   display: flex;
   float: right;
+  font-size: 12px;
   font-weight: 700;
+  margin: 0 0 10px 5px;
+  padding: 2.5px 2px 2.5px 7px;
   text-align: right;
   text-decoration: none;
+  text-transform: uppercase;
 
   i {
     font-size: .98em;
diff --git a/src/components/footer/style.scss b/src/components/footer/style.scss
index ba9abcd..08bd78d 100644
--- a/src/components/footer/style.scss
+++ b/src/components/footer/style.scss
@@ -24,6 +24,6 @@
   }
 
   .active {
-    color: var(--main-blue);
+    color: var(--main-purple);
   }
 }
diff --git a/src/components/formItem/style.scss b/src/components/formItem/style.scss
index 25f5889..ebbdb23 100644
--- a/src/components/formItem/style.scss
+++ b/src/components/formItem/style.scss
@@ -1,30 +1,91 @@
 .customFormfieldWrap {
-  border-bottom: .5px solid var(--main-color);
-  border-top: .5px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: .5px solid var(--main-color);
+  // border-top: .5px solid var(--main-color);
+  border: 0;
   display: flex;
   flex-direction: column;
   margin: 10px 0;
   padding: 14px 16px;
 
   label {
-    color: var(--main-color);
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
     margin: 5px 0 4px;
   }
-}
 
-.select {
-  background: var(--input-color);
-  border: 1px solid var(--main-color);
-  border-radius: 0;
-  font-size: 15px;
-  margin-bottom: 5px;
-  padding: 10px 5px;
+  select {
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
+    border-radius: 0;
+    display: inline-block;
+    font-size: 15px;
+    line-height: 1.5em;
+    padding: 0.5em 3.5em 0.5em 1em;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+  }
+
+  .select {
+    background-image:
+      linear-gradient(45deg, transparent 50%, var(--main-color) 50%),
+      linear-gradient(135deg, var(--main-color) 50%, transparent 50%),
+      linear-gradient(to right, var(--main-color), var(--main-color));
+    background-position:
+      calc(100% - 20px) calc(1em + 2px),
+      calc(100% - 15px) calc(1em + 2px),
+      calc(100% - 2.5em) 0.5em;
+    background-size:
+      5px 5px,
+      5px 5px,
+      1px 1.5em;
+    background-repeat: no-repeat;
+  }
+
+  .select:focus {
+    background-image:
+      linear-gradient(45deg, var(--main-color) 50%, transparent 50%),
+      linear-gradient(135deg, transparent 50%, var(--main-color) 50%),
+      linear-gradient(to right, var(--main-color), var(--main-color));
+    background-position:
+      calc(100% - 15px) 1em,
+      calc(100% - 20px) 1em,
+      calc(100% - 2.5em) 0.5em;
+    background-size:
+      5px 5px,
+      5px 5px,
+      1px 1.5em;
+    background-repeat: no-repeat;
+    border-color: var(--main-color);
+    outline: 0;
+  }
+
+  select:-moz-focusring {
+    color: transparent;
+    text-shadow: 0 0 0 var(--main-color);
+  }
 }
 
+// .select {
+//   background: var(--input-color);
+//   // border: 1px solid var(--main-color);
+//   border: 0;
+//   border-radius: 0;
+//   font-size: 15px;
+//   margin-bottom: 5px;
+//   padding: 10px 5px;
+// }
+
 .addedInputField {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   border-radius: 0;
   font-size: 15px;
   margin-top: 0;
diff --git a/src/components/header/index.js b/src/components/header/index.js
index e2fcbdc..94a3aba 100644
--- a/src/components/header/index.js
+++ b/src/components/header/index.js
@@ -3,7 +3,7 @@ import { Link } from 'preact-router/match';
 import { PropTypes } from 'preact-compat';
 import style from './style';
 
-import arrow from '../../assets/black/arrow.svg';
+import arrow from '../../assets/white/arrow.svg';
 
 export default class Header extends Component {
   render() {
diff --git a/src/components/item/index.js b/src/components/item/index.js
index 763be5b..1b2f975 100644
--- a/src/components/item/index.js
+++ b/src/components/item/index.js
@@ -5,7 +5,7 @@ import { Link } from 'preact-router/match';
 import style from './style';
 
 // Import images
-import mediaIcon from '../../assets/black/media.png';
+import mediaIcon from '../../assets/black/media.svg';
 import measurementIcon from '../../assets/black/measurements.svg';
 
 function defineImgSrc(details) {
diff --git a/src/components/item/style.scss b/src/components/item/style.scss
index 53b4307..5d52719 100644
--- a/src/components/item/style.scss
+++ b/src/components/item/style.scss
@@ -1,7 +1,7 @@
 .itemLinkWrap {
   align-items: center;
-  background-color: var(--main-bg-color);
-  border: .5px solid var(--main-color);
+  background-color: var(--main-light-color);
+  border: 0;
   display: flex;
   height: 50px;
   margin: 2.5px 0;
@@ -12,12 +12,13 @@
 .icon {
   display: inline-block;
   opacity: .6;
-  padding: 0 15px 0 10px;
+  padding: 0 25px 0 10px;
 }
 
 .date {
   display: inline-block;
   font-size: 13px;
+  font-weight: 700;
   width: 30%;
 }
 
@@ -38,10 +39,12 @@
 }
 
 .uploadStatText {
+  color: var(--main-blue);
   font-size: 13px;
 }
 
 .uploadStat {
-  font-size: 13px;
+  color: var(--main-blue);
+  font-size: 15px;
   padding: 0 7.5px;
 }
diff --git a/src/components/license/index.js b/src/components/license/index.js
new file mode 100644
index 0000000..e10678c
--- /dev/null
+++ b/src/components/license/index.js
@@ -0,0 +1,15 @@
+import { Component } from 'preact';
+import style from './style';
+
+export default class LicenseInfo extends Component {
+  render() {
+    return (
+      <div class={style.licenseWrapper}>
+        <p class={style.license}>
+          The code of this project is licensed under the terms of the GNU AGPLv3 license.
+          <a href="https://github.com/webgem-xyz/UVA-React#license-information">More info.</a>
+        </p>
+      </div>
+    );
+  }
+}
diff --git a/src/components/license/style.scss b/src/components/license/style.scss
new file mode 100644
index 0000000..85493ce
--- /dev/null
+++ b/src/components/license/style.scss
@@ -0,0 +1,18 @@
+.licenseWrapper {
+  background: var(--input-color);
+  bottom: 0;
+  display: block;
+  left: 0;
+  position: absolute;
+}
+
+.license {
+  font-size: 13px;
+  text-align: center;
+
+  a {
+    color: var(--main-blue);
+    font-size: 13px;
+    text-decoration: none;
+  }
+}
diff --git a/src/components/linkRequestButton/style.scss b/src/components/linkRequestButton/style.scss
index e02c08f..ee5b21c 100644
--- a/src/components/linkRequestButton/style.scss
+++ b/src/components/linkRequestButton/style.scss
@@ -3,11 +3,11 @@
   justify-content: flex-end;
 }
 .linkRequest {
-  background: none;
-  border: 1px solid var(--main-color);
+  background: var(--main-color);
+  border: 0;
   border-radius: 0;
-  color: var(--main-color);
-  font-size: 16px;
+  color: var(--main-bg-color);
+  font-size: 14px;
   font-weight: 700;
   margin: 15px 0;
   outline: 0;
diff --git a/src/components/locationPopup/style.scss b/src/components/locationPopup/style.scss
index 0731aa7..e245bcf 100644
--- a/src/components/locationPopup/style.scss
+++ b/src/components/locationPopup/style.scss
@@ -36,15 +36,15 @@
   justify-content: space-between;
 
   input {
-    background: none;
+    background: var(--main-color);
     border: 0;
     border-radius: 0;
-    color: var(--main-color);
-    font-size: 15px;
+    color: var(--main-light-color);
+    font-size: 12px;
     font-weight: 700;
-    margin: 0;
+    margin: 10px 0 0;
     outline: 0;
-    padding: 15px 0 5px;
+    padding: 7px;
     text-transform: uppercase;
   }
 }
diff --git a/src/components/map/index.js b/src/components/map/index.js
index 083ac05..b5beac2 100644
--- a/src/components/map/index.js
+++ b/src/components/map/index.js
@@ -24,7 +24,7 @@ export default class MapComponent extends Component {
         <div class={style.map}>
           <Gmaps
             width="100%"
-            height="150px"
+            height="125px"
             zoom={4}
             lat={Number(latitude)}
             lng={Number(longitude)}
diff --git a/src/components/map/style.scss b/src/components/map/style.scss
index 52b0d5d..a9a39de 100644
--- a/src/components/map/style.scss
+++ b/src/components/map/style.scss
@@ -1,15 +1,22 @@
 .location {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   padding: 10px;
+
+  p {
+    color: var(--main-color);
+    font-weight: 700;
+  }
 }
 
 .map {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   margin-bottom: 5px;
 }
 
 .label {
-  color: var(--main-color);
+  color: var(--main-blue);
   font-size: 16px;
   font-weight: 700;
   margin: 0 0 5px;
diff --git a/src/components/measurementRow/style.scss b/src/components/measurementRow/style.scss
index f7ca8b5..2115c42 100644
--- a/src/components/measurementRow/style.scss
+++ b/src/components/measurementRow/style.scss
@@ -1,7 +1,8 @@
 .row {
   align-items: baseline;
   background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   display: flex;
   flex: 1;
   flex-direction: row;
@@ -18,7 +19,7 @@
 }
 
 .label {
-  color: var(--main-color);
+  color: var(--main-blue);
   font-size: 16px;
   font-weight: 700;
 }
diff --git a/src/components/notification/style.scss b/src/components/notification/style.scss
index cd28500..ea3a053 100644
--- a/src/components/notification/style.scss
+++ b/src/components/notification/style.scss
@@ -1,6 +1,8 @@
 .notificationWrapper {
   align-items: center;
-  border: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   color: var(--main-color);
   display: flex;
   justify-content: space-between;
@@ -9,6 +11,7 @@
   text-decoration: none;
 
   p {
+    color: var(--main-blue);
     display: inline-block;
     font-size: 14px;
     font-weight: 700;
@@ -16,6 +19,7 @@
   }
 
   p:nth-child(2) {
+    color: var(--main-color);
     font-weight: 400;
     white-space: nowrap;
   }
diff --git a/src/components/removeMeasurementButton/index.js b/src/components/removeMeasurementButton/index.js
index e78090d..b1393d9 100644
--- a/src/components/removeMeasurementButton/index.js
+++ b/src/components/removeMeasurementButton/index.js
@@ -11,7 +11,8 @@ export default class RemoveMeasurementButton extends Component {
         }}
         class={style.removeButton}
       >
-        Delete {this.props.label}
+        Delete
+        <i class="material-icons">delete</i>
       </button>
     );
   }
diff --git a/src/components/removeMeasurementButton/style.scss b/src/components/removeMeasurementButton/style.scss
index f0c7450..ad7780a 100644
--- a/src/components/removeMeasurementButton/style.scss
+++ b/src/components/removeMeasurementButton/style.scss
@@ -1,13 +1,20 @@
 .removeButton {
-  background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
-  color: var(--main-color);
-  display: block;
-  font-size: 16px;
+  align-items: center;
+  background: var(--main-color);
+  border: 0;
+  color: var(--main-bg-color);
+  display: flex;
+  float: right;
+  font-size: 12px;
   font-weight: 700;
-  margin: 15px 25px;
-  outline: 0;
-  padding: 10px 10px;
+  margin: 0 5px 10px 0;
+  padding: 2.5px 2px 2.5px 7px;
+  text-align: right;
+  text-decoration: none;
   text-transform: uppercase;
-  width: calc(100% - 50px);
+
+  i {
+    font-size: .98em;
+    padding: 5px;
+  }
 }
diff --git a/src/routes/Media/index.js b/src/routes/Media/index.js
index 04377fa..10d3dc1 100644
--- a/src/routes/Media/index.js
+++ b/src/routes/Media/index.js
@@ -56,9 +56,14 @@ export default class Media extends Component {
     const measurement = this.state.measurement;
     return (
       <div class={style.media}>
-        <Header title={measurement.date} to="/" />
+        <Header title="Media" to="/" />
         <div class={style.dataWrap}>
           <EditLink type="media" to={`/editMedia/${this.props.mediaId}`} />
+          <RemoveMeasurementButton
+            Id={this.props.mediaId}
+            label="media"
+            removeMeasurement={this.props.removeMeasurement}
+          />
           {measurement.date && <MeasurementRow label="Date" value={measurement.date} />}
           <MapComponent
             latitude={measurement.latitude}
@@ -71,11 +76,6 @@ export default class Media extends Component {
           </section>
           {measurement.category && <MeasurementRow label="Category" value={measurement.category} />}
           {measurement.desc && <MeasurementRow label="Description" value={measurement.desc} desc />}
-          <RemoveMeasurementButton
-            Id={this.props.mediaId}
-            label="media"
-            removeMeasurement={this.props.removeMeasurement}
-          />
         </div>
       </div>
     );
diff --git a/src/routes/Media/style.scss b/src/routes/Media/style.scss
index 6505c5f..9f8f33b 100644
--- a/src/routes/Media/style.scss
+++ b/src/routes/Media/style.scss
@@ -1,5 +1,6 @@
 .imgWrap {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   display: inline-block;
   height: calc(50vw - 30px);
   position: relative;
@@ -20,6 +21,18 @@
 
 .dataWrap {
   padding: 16px;
+
+  section {
+    background: var(--main-light-color);
+  }
+
+  > div {
+    background: var(--main-light-color);
+  }
+
+  > div:nth-child(even) {
+    background: var(--main-bg-color);
+  }
 }
 
 .mediaWrap {
@@ -29,7 +42,7 @@
 }
 
 .label {
-  color: var(--main-color);
+  color: var(--main-blue);
   font-size: 16px;
   font-weight: 700;
 }
@@ -40,7 +53,8 @@
 }
 
 .mediaRow {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   padding: 10px;
 }
 
diff --git a/src/routes/account/style.scss b/src/routes/account/style.scss
index 06121d4..ec59470 100644
--- a/src/routes/account/style.scss
+++ b/src/routes/account/style.scss
@@ -16,9 +16,10 @@
 }
 
 .logout {
-  background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
-  color: var(--main-color);
+  background: var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
+  color: var(--main-bg-color);
   display: inline-block;
   font-size: 16px;
   font-weight: 700;
diff --git a/src/routes/add/index.js b/src/routes/add/index.js
index 4adbc31..8a06549 100644
--- a/src/routes/add/index.js
+++ b/src/routes/add/index.js
@@ -195,7 +195,7 @@ export default class Add extends Component {
           <p class={style.addButtonLabel}>add item</p>
           {this.state.count > 0 && (
             <button class={style.submit} type="submit">
-              submit measurement
+              save measurement
             </button>
           )}
         </form>
diff --git a/src/routes/add/style.scss b/src/routes/add/style.scss
index fa8b1b9..e8a63ee 100644
--- a/src/routes/add/style.scss
+++ b/src/routes/add/style.scss
@@ -1,6 +1,6 @@
 .mainInputs {
-  background: var(--main-bg-color);
-  border-bottom: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: 1px solid var(--main-color);
   padding: 16px;
 }
 
@@ -29,8 +29,9 @@
 }
 
 .customFormfieldWrap {
-  border-bottom: .5px solid var(--main-color);
-  border-top: .5px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: .5px solid var(--main-color);
+  // border-top: .5px solid var(--main-color);
   display: flex;
   flex-direction: column;
   margin: 10px 0;
@@ -142,17 +143,17 @@
 }
 
 .submit {
-  background: var(--main-bg-color);
+  background: var(--main-color);
   border: 1px solid var(--main-color);
   border-radius: 0;
-  color: var(--main-color);
-  font-size: 16px;
+  color: var(--main-light-color);
+  font-size: 15px;
   font-weight: 700;
   left: 50%;
   margin-bottom: 16px;
   margin-top: 10px;
   outline: 0;
-  padding: 20px;
+  padding: 10px;
   position: relative;
   text-transform: uppercase;
   transform: translateX(-50%);
diff --git a/src/routes/addMedia/index.js b/src/routes/addMedia/index.js
index 9ce364b..1190031 100644
--- a/src/routes/addMedia/index.js
+++ b/src/routes/addMedia/index.js
@@ -242,7 +242,7 @@ export default class AddMedia extends Component {
           <p class={style.addButtonLabel}>add media</p>
           {this.state.count > 0 && (
             <button class={style.submit} type="submit">
-              submit media
+              save media
             </button>
           )}
         </form>
diff --git a/src/routes/addMedia/style.scss b/src/routes/addMedia/style.scss
index c9748c2..2448c8d 100644
--- a/src/routes/addMedia/style.scss
+++ b/src/routes/addMedia/style.scss
@@ -1,15 +1,17 @@
 .mainInputs {
-  background: var(--main-bg-color);
-  border-bottom: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: 1px solid var(--main-color);
+  border: 0;
   padding: 16px;
 }
 
 .uploadButton {
   align-items: center;
-  background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
+  background: var(--main-purple);
+  // border: 1px solid var(--main-color);
+  border: 0;
   border-radius: 50%;
-  color: var(--main-color);
+  color: var(--main-light-color);
   display: flex;
   font-size: 50px;
   font-weight: 400;
@@ -48,13 +50,15 @@
   margin-top: 15px;
 
   label {
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
   }
 
   select {
-    background: var(--main-bg-color);
-    border: 1px solid var(--main-color);
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
     border-radius: 0;
     display: inline-block;
     font-size: 15px;
@@ -128,7 +132,8 @@
 
 .uploadedImage {
   background: var(--main-color);
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   display: inline-block;
   height: calc(50vw - 18.5px);
   outline: 0;
@@ -137,13 +142,13 @@
 
   .remove {
     align-items: center;
-    background: var(--main-color);
+    background: var(--main-purple);
     border: 0;
     border-radius: 50%;
     color: var(--main-bg-color);
     display: flex;
-    font-size: 30px;
-    height: 40px;
+    font-size: 15px;
+    height: 30px;
     justify-content: center;
     margin: 0;
     outline: 0;
@@ -151,7 +156,7 @@
     position: absolute;
     right: 5px;
     top: 5px;
-    width: 40px;
+    width: 30px;
 
     .icon {
       color: var(--main-bg-color);
@@ -167,17 +172,17 @@
 }
 
 .submit {
-  background: var(--main-bg-color);
+  background: var(--main-color);
   border: 1px solid var(--main-color);
   border-radius: 0;
-  color: var(--main-color);
-  font-size: 16px;
+  color: var(--main-light-color);
+  font-size: 15px;
   font-weight: 700;
   left: 50%;
   margin-bottom: 16px;
   margin-top: 10px;
   outline: 0;
-  padding: 20px;
+  padding: 10px;
   position: relative;
   text-transform: uppercase;
   transform: translateX(-50%);
@@ -190,8 +195,9 @@
 
   button {
     align-items: center;
-    background: none;
-    border: 1px solid var(--main-color);
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
     border-radius: 0;
     color: var(--main-color);
     display: flex;
@@ -207,7 +213,7 @@
   }
 
   label {
-    color: var(--main-color);
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
     padding: 0;
diff --git a/src/routes/createAccount/index.js b/src/routes/createAccount/index.js
index 51b5f88..a922561 100644
--- a/src/routes/createAccount/index.js
+++ b/src/routes/createAccount/index.js
@@ -4,6 +4,7 @@ import { Link } from 'preact-router/match';
 
 import InputGroup from '../../components/inputGroup/';
 import logo from '../../assets/logo.svg';
+import LicenseInfo from '../../components/license/';
 
 import style from './style';
 
@@ -28,7 +29,7 @@ export default class CreateAccount extends Component {
   render() {
     return (
       <div class={style.createAccountWrapper}>
-        <img src={logo} alt="Logo MyMarine" />
+        <img src={logo} alt="Logo MyMarine" class={style.logo} />
         <form
           class={style.createAccountForm}
           onSubmit={e => this.props.createAccount(e, this.state.email, this.state.password)}
@@ -63,6 +64,7 @@ export default class CreateAccount extends Component {
             </Link>
           </section>
         </form>
+        <LicenseInfo />
       </div>
     );
   }
diff --git a/src/routes/createAccount/style.scss b/src/routes/createAccount/style.scss
index c7b3366..457f43d 100644
--- a/src/routes/createAccount/style.scss
+++ b/src/routes/createAccount/style.scss
@@ -1,14 +1,23 @@
 .createAccountForm {
   padding: 16px;
 
+  > div {
+
+    label {
+      color: var(--input-color);
+    }
+  }
+
   .createAccountSubmit {
-    background: none;
-    border: 1px solid var(--main-color);
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
     border-radius: 0;
-    color: var(--main-color);
+    color: var(--main-blue);
+    font-size: 15px;
     font-weight: 700;
     margin: 15px 0;
-    padding: 15px;
+    padding: 10px 15px;
   }
 }
 
@@ -19,9 +28,23 @@
   margin-top: 5px;
 
   .cancel {
-    color: var(--main-color);
+    color: var(--input-color);
     font-weight: 700;
     text-decoration: none;
     text-transform: uppercase;
   }
 }
+
+.createAccountWrapper {
+  align-items: center;
+  background: var(--main-blue);
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  min-height: 100vh;
+}
+
+.logo {
+  margin-top: 20px;
+  width: 60%;
+}
diff --git a/src/routes/edit/style.scss b/src/routes/edit/style.scss
index 941a3de..25822e0 100644
--- a/src/routes/edit/style.scss
+++ b/src/routes/edit/style.scss
@@ -1,6 +1,7 @@
 .mainInputs {
-  background: var(--main-bg-color);
-  border-bottom: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: 1px solid var(--main-color);
+  border: 0;
   padding: 16px;
 }
 
@@ -87,17 +88,17 @@
 }
 
 .submit {
-  background: var(--main-bg-color);
+  background: var(--main-color);
   border: 1px solid var(--main-color);
   border-radius: 0;
-  color: var(--main-color);
-  font-size: 16px;
+  color: var(--main-light-color);
+  font-size: 15px;
   font-weight: 700;
   left: 50%;
   margin-bottom: 16px;
   margin-top: 10px;
   outline: 0;
-  padding: 20px;
+  padding: 10px;
   position: relative;
   text-transform: uppercase;
   transform: translateX(-50%);
@@ -110,8 +111,9 @@
 
   button {
     align-items: center;
-    background: none;
-    border: 1px solid var(--main-color);
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
     border-radius: 0;
     color: var(--main-color);
     display: flex;
@@ -131,7 +133,7 @@
   }
 
   label {
-    color: var(--main-color);
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
     padding: 0;
@@ -146,8 +148,8 @@
 }
 
 .editMain {
-  background: var(--main-bg-color);
-  border-bottom: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: 1px solid var(--main-color);
   display: block;
   padding: 16px;
 }
diff --git a/src/routes/editMedia/style.scss b/src/routes/editMedia/style.scss
index ed50070..7c27515 100644
--- a/src/routes/editMedia/style.scss
+++ b/src/routes/editMedia/style.scss
@@ -1,5 +1,5 @@
 .mainInputs {
-  background: var(--main-bg-color);
+  background: var(--main-light-color);
   border-bottom: 1px solid var(--main-color);
   padding: 16px;
 }
@@ -37,20 +37,68 @@
   padding: 14px 16px;
 
   label {
-    color: var(--main-color);
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
     margin: 5px 0 4px;
   }
 }
 
-.select {
-  background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
+select {
+  background: var(--input-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   border-radius: 0;
+  display: inline-block;
   font-size: 15px;
-  margin: 5px 0;
-  padding: 10px 5px;
+  line-height: 1.5em;
+  padding: 0.5em 3.5em 0.5em 1em;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+}
+
+.select {
+  background-image:
+    linear-gradient(45deg, transparent 50%, var(--main-color) 50%),
+    linear-gradient(135deg, var(--main-color) 50%, transparent 50%),
+    linear-gradient(to right, var(--main-color), var(--main-color));
+  background-position:
+    calc(100% - 20px) calc(1em + 2px),
+    calc(100% - 15px) calc(1em + 2px),
+    calc(100% - 2.5em) 0.5em;
+  background-size:
+    5px 5px,
+    5px 5px,
+    1px 1.5em;
+  background-repeat: no-repeat;
+}
+
+.select:focus {
+  background-image:
+    linear-gradient(45deg, var(--main-color) 50%, transparent 50%),
+    linear-gradient(135deg, transparent 50%, var(--main-color) 50%),
+    linear-gradient(to right, var(--main-color), var(--main-color));
+  background-position:
+    calc(100% - 15px) 1em,
+    calc(100% - 20px) 1em,
+    calc(100% - 2.5em) 0.5em;
+  background-size:
+    5px 5px,
+    5px 5px,
+    1px 1.5em;
+  background-repeat: no-repeat;
+  border-color: var(--main-color);
+  outline: 0;
+}
+
+select:-moz-focusring {
+  color: transparent;
+  text-shadow: 0 0 0 var(--main-color);
 }
 
 .addedInputField {
@@ -81,6 +129,7 @@
   margin-top: 15px;
 
   label {
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
   }
@@ -93,8 +142,9 @@
 
   button {
     align-items: center;
-    background: none;
-    border: 1px solid var(--main-color);
+    background: var(--input-color);
+    // border: 1px solid var(--main-color);
+    border: 0;
     border-radius: 0;
     color: var(--main-color);
     display: flex;
@@ -114,7 +164,7 @@
   }
 
   label {
-    color: var(--main-color);
+    color: var(--main-blue);
     font-size: 16px;
     font-weight: 700;
     padding: 0;
@@ -129,31 +179,33 @@
 }
 
 .editMain {
-  background: var(--main-bg-color);
-  border-bottom: 1px solid var(--main-color);
+  background: var(--main-light-color);
+  // border-bottom: 1px solid var(--main-color);
+  border: 0;
   display: block;
   padding: 16px;
 }
 
 .submit {
-  background: var(--main-bg-color);
+  background: var(--main-color);
   border: 1px solid var(--main-color);
   border-radius: 0;
-  color: var(--main-color);
-  font-size: 16px;
+  color: var(--main-light-color);
+  font-size: 15px;
   font-weight: 700;
   left: 50%;
   margin-bottom: 16px;
   margin-top: 10px;
   outline: 0;
-  padding: 20px;
+  padding: 10px;
   position: relative;
   text-transform: uppercase;
   transform: translateX(-50%);
 }
 
 .imgWrap {
-  border: 1px solid var(--main-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
   display: inline-block;
   height: calc(50vw - 20px);
   position: relative;
diff --git a/src/routes/login/index.js b/src/routes/login/index.js
index c429d62..039fc59 100644
--- a/src/routes/login/index.js
+++ b/src/routes/login/index.js
@@ -29,7 +29,7 @@ export default class Login extends Component {
   render() {
     return (
       <div class={style.login}>
-        <img src={logo} alt="Logo MyMarine" />
+        <img src={logo} alt="Logo MyMarine" class={style.logo} />
         <form
           class={style.loginForm}
           onSubmit={e => this.props.authenticate(e, this.state.email, this.state.password)}
@@ -56,7 +56,7 @@ export default class Login extends Component {
           />
           <section class={style.formButtons}>
             <button type="submit" class={style.loginSub}>
-              log in
+              Login
             </button>
             <Link class={style.forgot} href="/forgot">
               forgot password?
diff --git a/src/routes/login/style.scss b/src/routes/login/style.scss
index e0e26c6..2487a94 100644
--- a/src/routes/login/style.scss
+++ b/src/routes/login/style.scss
@@ -1,5 +1,6 @@
 .login {
   align-items: center;
+  background: var(--main-blue);
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -7,24 +8,32 @@
 }
 
 .loginForm {
-  padding: 16px;
+  padding: 10px 16px;
+
+  > div {
+
+    label {
+      color: white;
+    }
+  }
 }
 
 .loginSub {
-  background: var(--main-bg-color);
-  border: 1px solid var(--main-color);
-  color: var(--main-color);
+  background: var(--input-color);
+  // border: 1px solid var(--main-color);
+  border: 0;
+  color: var(--main-blue);
   display: inline-block;
-  font-size: 16px;
+  font-size: 15px;
   font-weight: 700;
   margin: 7.5px 0;
   outline: 0;
-  padding: 15px 17px;
-  text-transform: uppercase;
+  padding: 10px 17px;
+  // text-transform: uppercase;
 }
 
 .forgot {
-  color: var(--main-color);
+  color: var(--input-color);
   display: inline-block;
   font-size: 16px;
   font-weight: 700;
@@ -41,14 +50,20 @@
   margin-top: 5px;
 }
 
+.logo {
+  margin-top: 20px;
+  width: 60%;
+}
+
 .devider {
+  color: var(--main-bg-color);
   display: block;
   text-align: center;
   text-transform: uppercase;
 }
 
 .createAccount {
-  color: var(--main-color);
+  color: var(--main-bg-color);
   display: block;
   font-size: 16px;
   font-weight: 700;
diff --git a/src/routes/measurement/index.js b/src/routes/measurement/index.js
index 32d48df..37830dd 100644
--- a/src/routes/measurement/index.js
+++ b/src/routes/measurement/index.js
@@ -44,9 +44,14 @@ export default class Measurement extends Component {
     const measurement = this.state.measurement;
     return (
       <div class={style.container}>
-        <Header title={measurement.date} to="/" />
+        <Header title="Measurement" to="/" />
         <div class={style.measurementWrapper}>
           <EditLink type="measurement" to={`/edit/${this.props.measurementId}`} />
+          <RemoveMeasurementButton
+            Id={this.props.measurementId}
+            label="measurement"
+            removeMeasurement={this.props.removeMeasurement}
+          />
           {measurement.date && <MeasurementRow label="Date" value={measurement.date} />}
           <MapComponent
             latitude={measurement.latitude}
@@ -58,11 +63,6 @@ export default class Measurement extends Component {
           {measurement.tempature && (
             <MeasurementRow label="Tempature" value={measurement.tempature} />
           )}
-          <RemoveMeasurementButton
-            Id={this.props.measurementId}
-            label="measurement"
-            removeMeasurement={this.props.removeMeasurement}
-          />
         </div>
       </div>
     );
diff --git a/src/routes/measurement/style.scss b/src/routes/measurement/style.scss
index eec9ebc..50c7024 100644
--- a/src/routes/measurement/style.scss
+++ b/src/routes/measurement/style.scss
@@ -68,6 +68,14 @@ p {margin: 0;}
 .measurementWrapper {
   padding: 16px;
   width: 100%;
+
+  > div {
+    background: var(--main-light-color);
+  }
+
+  > div:nth-child(even) {
+    background: var(--main-bg-color);
+  }
 }
 
 .edit {
diff --git a/src/routes/overview/index.js b/src/routes/overview/index.js
index a910045..3fb6687 100644
--- a/src/routes/overview/index.js
+++ b/src/routes/overview/index.js
@@ -9,8 +9,8 @@ import AddButton from '../../components/addButton/index';
 import FilterButton from '../../components/filterButton/index';
 
 // Import image
-import addIcon from '../../assets/black/measurements.svg';
-import mediaIcon from '../../assets/black/media.png';
+import addIcon from '../../assets/white/measurements.svg';
+import mediaIcon from '../../assets/white/media.svg';
 
 export default class Overview extends Component {
   constructor(props) {
diff --git a/src/routes/overview/style.scss b/src/routes/overview/style.scss
index 7ac3c52..74a22ca 100644
--- a/src/routes/overview/style.scss
+++ b/src/routes/overview/style.scss
@@ -23,12 +23,13 @@
 }
 
 .labels p {
+  color: var(--main-blue);
   font-weight: 700;
   margin: 0;
 }
 
 .labels p:nth-child(1) {
-  width: 45px;
+  width: 55px;
 }
 
 .labels p:nth-child(2) {
diff --git a/src/style/index.scss b/src/style/index.scss
index 57841a6..aa74d1a 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -34,3 +34,18 @@ body {
   min-height: 100%;
   padding-bottom: 60px;
 }
+
+button,
+p,
+span,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+a,
+label,
+input {
+  font-family: 'Quattrocento Sans', sans-serif;
+}