diff --git a/css/offcanvas.css b/css/offcanvas.css
index 7d4a50c..3a76bbc 100644
--- a/css/offcanvas.css
+++ b/css/offcanvas.css
@@ -80,4 +80,5 @@ body {
 
 .rounded {
   border-radius: .7rem !important;
+ }  
 }
\ No newline at end of file
diff --git a/img/icons/1.png b/img/icons/1.png
new file mode 100644
index 0000000..58a056f
Binary files /dev/null and b/img/icons/1.png differ
diff --git a/img/icons/10.png b/img/icons/10.png
new file mode 100644
index 0000000..bb02af3
Binary files /dev/null and b/img/icons/10.png differ
diff --git a/img/icons/11.png b/img/icons/11.png
new file mode 100644
index 0000000..8c9daa4
Binary files /dev/null and b/img/icons/11.png differ
diff --git a/img/icons/12.png b/img/icons/12.png
new file mode 100644
index 0000000..8bc5282
Binary files /dev/null and b/img/icons/12.png differ
diff --git a/img/icons/13.png b/img/icons/13.png
new file mode 100644
index 0000000..175f610
Binary files /dev/null and b/img/icons/13.png differ
diff --git a/img/icons/14.png b/img/icons/14.png
new file mode 100644
index 0000000..6debe58
Binary files /dev/null and b/img/icons/14.png differ
diff --git a/img/icons/15.png b/img/icons/15.png
new file mode 100644
index 0000000..2958286
Binary files /dev/null and b/img/icons/15.png differ
diff --git a/img/icons/16.png b/img/icons/16.png
new file mode 100644
index 0000000..0ed326b
Binary files /dev/null and b/img/icons/16.png differ
diff --git a/img/icons/17.png b/img/icons/17.png
new file mode 100644
index 0000000..dde075f
Binary files /dev/null and b/img/icons/17.png differ
diff --git a/img/icons/18.png b/img/icons/18.png
new file mode 100644
index 0000000..bd7ee8f
Binary files /dev/null and b/img/icons/18.png differ
diff --git a/img/icons/19.png b/img/icons/19.png
new file mode 100644
index 0000000..e763c88
Binary files /dev/null and b/img/icons/19.png differ
diff --git a/img/icons/2.png b/img/icons/2.png
new file mode 100644
index 0000000..5c63801
Binary files /dev/null and b/img/icons/2.png differ
diff --git a/img/icons/3.png b/img/icons/3.png
new file mode 100644
index 0000000..44beff5
Binary files /dev/null and b/img/icons/3.png differ
diff --git a/img/icons/4.png b/img/icons/4.png
new file mode 100644
index 0000000..7985629
Binary files /dev/null and b/img/icons/4.png differ
diff --git a/img/icons/5.png b/img/icons/5.png
new file mode 100644
index 0000000..7876977
Binary files /dev/null and b/img/icons/5.png differ
diff --git a/img/icons/6.png b/img/icons/6.png
new file mode 100644
index 0000000..f64ee70
Binary files /dev/null and b/img/icons/6.png differ
diff --git a/img/icons/7.png b/img/icons/7.png
new file mode 100644
index 0000000..cf25e06
Binary files /dev/null and b/img/icons/7.png differ
diff --git a/img/icons/8.png b/img/icons/8.png
new file mode 100644
index 0000000..150b10a
Binary files /dev/null and b/img/icons/8.png differ
diff --git a/img/icons/9.png b/img/icons/9.png
new file mode 100644
index 0000000..c2c3a1b
Binary files /dev/null and b/img/icons/9.png differ
diff --git a/img/icons/dust.svg b/img/icons/dust.svg
deleted file mode 100644
index 6e1bab7..0000000
--- a/img/icons/dust.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="151.18" height="151.18" version="1.1" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-257)" stroke-width=".26458">
-  <ellipse cx="7.0158" cy="270.64" rx="2.205" ry="3.842"/>
-  <ellipse cx="14.098" cy="280.96" rx="2.6059" ry="3.0736"/>
-  <ellipse cx="17.072" cy="269.1" rx="2.1716" ry="4.1761"/>
-  <ellipse cx="30.034" cy="283" rx="3.4411" ry="6.1138"/>
-  <ellipse cx="20.713" cy="277.26" rx="2.3386" ry="2.9066"/>
-  <ellipse cx="27.662" cy="265.23" rx="2.4722" ry="3.9088"/>
-  <ellipse cx="27.896" cy="273.48" rx="1.7038" ry="2.6059"/>
-  <ellipse cx="14.165" cy="288.31" rx="5.8799" ry="3.1404"/>
- </g>
-</svg>
diff --git a/img/icons/humidity.svg b/img/icons/humidity.svg
deleted file mode 100644
index e448ff5..0000000
--- a/img/icons/humidity.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M344.864,112.832c-26.176-33.408-53.248-67.904-75.072-104.96C266.912,3.008,261.664,0,256,0s-10.912,3.008-13.76,7.872
-			c-21.824,37.024-48.896,71.552-75.072,104.928C114.112,180.448,64,244.352,64,320c0,105.888,86.112,192,192,192
-			s192-86.112,192-192C448,244.384,397.92,180.48,344.864,112.832z M256,480c-88.224,0-160-71.776-160-160
-			c0-64.608,46.784-124.256,96.352-187.456c21.632-27.584,43.84-55.904,63.648-86.24c19.808,30.336,42.016,58.688,63.648,86.272
-			C369.216,195.744,416,255.424,416,320C416,408.224,344.224,480,256,480z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M208,192c-26.464,0-48,21.536-48,48s21.536,48,48,48s48-21.536,48-48S234.464,192,208,192z M208,256
-			c-8.832,0-16-7.168-16-16c0-8.832,7.168-16,16-16c8.832,0,16,7.168,16,16C224,248.832,216.832,256,208,256z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M304,352c-26.464,0-48,21.536-48,48s21.536,48,48,48s48-21.536,48-48S330.464,352,304,352z M304,416c-8.8,0-16-7.2-16-16
-			s7.2-16,16-16s16,7.2,16,16S312.8,416,304,416z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M347.296,228.704c-6.24-6.24-16.384-6.24-22.624,0l-160,160c-6.24,6.24-6.24,16.384,0,22.624
-			C167.808,414.432,171.904,416,176,416s8.192-1.568,11.296-4.672l160-160C353.536,245.088,353.536,234.944,347.296,228.704z"/>
-	</g>
-</g>
-</svg>
diff --git a/img/icons/pressure.svg b/img/icons/pressure.svg
deleted file mode 100644
index 307d250..0000000
--- a/img/icons/pressure.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="454.355px" height="454.355px" viewBox="0 0 454.355 454.355" style="enable-background:new 0 0 454.355 454.355;"
-	 xml:space="preserve">
-	<g>
-		<path d="M227.178,48.175C101.911,48.175,0,144.153,0,262.126c0,50.51,19.048,99.542,53.634,138.066    c3.416,3.806,8.308,5.987,13.421,5.987h320.246c5.113,0,10.006-2.182,13.422-5.987c34.586-38.523,53.633-87.557,53.633-138.066    C454.355,144.152,352.445,48.175,227.178,48.175z M357.752,303.859c-1.84-0.916-3.805-1.382-5.838-1.382    c-5.021,0-9.529,2.789-11.766,7.277c-1.562,3.139-1.811,6.696-0.697,10.021c1.113,3.325,3.455,6.018,6.594,7.58l46.828,23.319    c-3.645,5.925-7.65,11.662-12.016,17.159l-1.805,2.271H75.304l-1.806-2.271c-4.811-6.057-8.331-11.162-12.021-17.168    l46.835-23.311c3.138-1.562,5.48-4.255,6.593-7.58c1.114-3.324,0.866-6.883-0.697-10.021c-2.236-4.489-6.745-7.279-11.765-7.279    c-2.034,0-3.997,0.466-5.836,1.382l-47.146,23.482c-8.755-20.708-13.388-42.918-13.388-65.214c0-8.202,0.613-16.273,1.773-24.183    l45.531,6.926c0.659,0.102,1.33,0.152,1.998,0.152c6.417,0,11.985-4.795,12.953-11.154c1.088-7.154-3.848-13.861-11.003-14.951    l-43.606-6.633c9.33-29.7,26.774-56.203,49.94-77.287l31.538,32.432c2.493,2.565,5.835,3.977,9.412,3.977    c3.437,0,6.685-1.32,9.148-3.716c2.515-2.445,3.926-5.722,3.975-9.228c0.049-3.506-1.27-6.821-3.714-9.335l-29.647-30.487    c28.327-19.346,62.563-31.608,99.68-33.964v44.528c0,7.238,5.889,13.127,13.126,13.127s13.125-5.889,13.125-13.127V84.674    c37.117,2.356,71.355,14.618,99.682,33.964l-29.648,30.488c-2.443,2.514-3.764,5.829-3.713,9.335    c0.049,3.505,1.459,6.782,3.973,9.226c2.465,2.397,5.715,3.717,9.15,3.717c3.576,0,6.918-1.412,9.412-3.976l31.537-32.432    c23.166,21.083,40.611,47.586,49.939,77.286l-43.605,6.634c-7.154,1.089-12.092,7.796-11.002,14.95    c0.967,6.358,6.535,11.154,12.953,11.154c0.668,0,1.338-0.051,1.992-0.15l45.537-6.928c1.16,7.91,1.773,15.98,1.773,24.184    c0,22.301-4.635,44.517-13.395,65.229L357.752,303.859z"/><path d="M234.657,256.373l-41.191-91.438c-0.897-1.996-3.115-3.138-5.321-2.606c-2.493,0.601-4.028,3.109-3.427,5.602    l23.488,97.497c-5.781,6.966-7.905,16.686-4.759,25.877c4.805,14.035,20.078,21.518,34.113,16.714    c14.037-4.806,21.519-20.079,16.714-34.114C251.129,264.713,243.494,258.333,234.657,256.373z"/>
-            
-		<path d="M234.657,256.373l-41.191-91.438c-0.897-1.996-3.115-3.138-5.321-2.606c-2.493,0.601-4.028,3.109-3.427,5.602 l23.488,97.497c-5.781,6.966-7.905,16.686-4.759,25.877c4.805,14.035,20.078,21.518,34.113,16.714 c14.037-4.806,21.519-20.079,16.714-34.114C251.129,264.713,243.494,258.333,234.657,256.373z"/>
-	</g>
-</svg>
diff --git a/img/icons/pressureNew.svg b/img/icons/pressureNew.svg
deleted file mode 100644
index 2853f96..0000000
--- a/img/icons/pressureNew.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="90.709" height="90.709" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-273)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round">
-  <path d="m3.5773 291.32a9.3994 9.5811 0 0 1 2.9068-11.322 9.3994 9.5811 0 0 1 11.482-9e-3 9.3994 9.5811 0 0 1 2.9239 11.318" stroke-width="2.2022"/>
-  <path d="m11.866 288.27 1.5624 0.28012 0.20822-1.4828-7.8845-9.5549z" stroke-width="1.1113"/>
- </g>
-</svg>
diff --git a/img/icons/pressureTest.svg b/img/icons/pressureTest.svg
deleted file mode 100644
index be2d4c3..0000000
--- a/img/icons/pressureTest.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 24 24" width="24pt" height="24pt"><defs><clipPath id="_clipPath_G6tOBFN7PuNGnVHLyugt38T77Ukt4pbz"><rect width="24" height="24"/></clipPath></defs><g clip-path="url(#_clipPath_G6tOBFN7PuNGnVHLyugt38T77Ukt4pbz)"><circle vector-effect="non-scaling-stroke" cx="11.5" cy="12.5" r="8.5" fill="rgb(235,235,235)"/></g></svg>
\ No newline at end of file
diff --git a/img/icons/rain.svg b/img/icons/rain.svg
deleted file mode 100644
index d10e802..0000000
--- a/img/icons/rain.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 76.977 76.977" style="enable-background:new 0 0 76.977 76.977;" xml:space="preserve">
-<g>
-	<path d="M38.489,76.977c-15.54,0-28.183-12.643-28.183-28.182c0-14.53,23.185-44.307,25.828-47.654C36.703,0.421,37.571,0,38.488,0
-		c0.917,0,1.785,0.42,2.354,1.141c2.644,3.348,25.828,33.124,25.828,47.654C66.671,64.334,54.029,76.977,38.489,76.977z
-		 M38.489,7.917c-7.847,10.409-22.183,31.389-22.183,40.878c0,12.231,9.951,22.182,22.183,22.182s22.183-9.95,22.183-22.182
-		C60.671,39.306,46.335,18.326,38.489,7.917z"/>
-	<path d="M38.489,64.981c-1.657,0-3-1.343-3-3s1.343-3,3-3c5.616,0,10.186-4.567,10.186-10.183c0-1.657,1.343-3,3-3
-		c1.656,0,3,1.343,3,3C54.674,57.721,47.413,64.981,38.489,64.981z"/>
-</g>
-</svg>
diff --git a/img/icons/sun.svg b/img/icons/sun.svg
deleted file mode 100644
index 43dd8c7..0000000
--- a/img/icons/sun.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 399.079 399.079" style="enable-background:new 0 0 399.079 399.079;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M371.84,100.04c-2.01-3.457-6.443-4.63-9.9-2.62l-35.36,20.44c-3.457,2.01-4.63,6.443-2.62,9.9
-			c2.01,3.457,6.443,4.63,9.9,2.62l35.36-20.44C372.677,107.929,373.85,103.497,371.84,100.04z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M369.22,289.18l-35.36-20.44c-3.457-2.01-7.89-0.837-9.9,2.62c-2.01,3.457-0.837,7.89,2.62,9.9l35.36,20.44
-			c3.457,2.01,7.89,0.837,9.9-2.62C373.85,295.622,372.677,291.19,369.22,289.18z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M200.099,342.62c-4.01-0.298-7.501,2.711-7.799,6.721c-0.027,0.359-0.027,0.719,0,1.078v40.84
-			c-0.298,4.01,2.711,7.501,6.721,7.799s7.501-2.711,7.799-6.721c0.027-0.359,0.027-0.719,0-1.078v-40.84
-			C207.117,346.41,204.108,342.918,200.099,342.62z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M72.5,117.86L37.14,97.42c-3.457-2.01-7.89-0.837-9.9,2.62c-2.01,3.457-0.837,7.89,2.62,9.9l35.36,20.44
-			c3.457,2.01,7.89,0.837,9.9-2.62C77.13,124.302,75.957,119.87,72.5,117.86z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M200.099,0.02c-4.01-0.298-7.501,2.711-7.799,6.721c-0.027,0.359-0.027,0.719,0,1.078v40.84
-			c0.022,3.989,3.251,7.218,7.24,7.24c4.021,0,7.28-3.259,7.28-7.28V7.82C207.117,3.81,204.108,0.318,200.099,0.02z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M130.34,65.22l-20.4-35.36c-2.01-3.457-6.443-4.63-9.9-2.62c-3.457,2.01-4.63,6.443-2.62,9.9l20.4,35.36
-			c2.01,3.457,6.443,4.63,9.9,2.62C131.177,73.109,132.35,68.677,130.34,65.22z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M200.618,134.94c-0.359-0.027-0.719-0.027-1.078,0c-35.678,0-64.6,28.922-64.6,64.6c0,4.021,3.259,7.28,7.28,7.28
-			c4.005-0.022,7.24-3.275,7.24-7.28c-0.022-27.636,22.364-50.058,50-50.08c0.027,0,0.053,0,0.08,0
-			c4.01,0.298,7.501-2.711,7.799-6.721S204.628,135.237,200.618,134.94z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M397.98,198.98c-0.267-3.595-3.125-6.454-6.721-6.721h-40.84c-4.01-0.298-7.501,2.711-7.799,6.721
-			s2.711,7.501,6.721,7.799c0.359,0.027,0.72,0.027,1.079,0h40.84C395.269,206.482,398.278,202.99,397.98,198.98z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M49.738,192.3c-0.359-0.027-0.719-0.027-1.078,0H7.82c-4.01,0.298-7.019,3.79-6.721,7.799
-			c0.267,3.595,3.125,6.454,6.721,6.721h40.84c4.01,0.298,7.501-2.711,7.799-6.721C56.757,196.089,53.748,192.597,49.738,192.3z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M199.569,92.7c-59.006-0.008-106.846,47.819-106.855,106.825c-0.004,28.347,11.258,55.534,31.305,75.575
-			c20.009,20.059,47.188,31.316,75.52,31.28c59.006,0.008,106.847-47.819,106.855-106.825S258.575,92.708,199.569,92.7z
-			 M264.819,264.94c-36.053,36.053-94.507,36.053-130.56,0c-17.343-17.343-27.072-40.874-27.04-65.4
-			c-0.035-24.492,9.697-47.987,27.04-65.28v0.12c36.053-36.053,94.507-36.053,130.56,0
-			C300.873,170.433,300.873,228.887,264.819,264.94z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M301.678,361.972c-0.006-0.011-0.012-0.022-0.019-0.032l-20.44-35.36c-2.01-3.457-6.443-4.63-9.9-2.62
-			c-3.457,2.01-4.63,6.443-2.62,9.9l20.44,35.36c2.002,3.453,6.422,4.634,9.88,2.64
-			C302.484,369.863,303.675,365.436,301.678,361.972z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M299.28,27.24c-3.457-2.01-7.89-0.837-9.9,2.62l-20.44,35.36c-2.024,3.449-0.868,7.885,2.58,9.908
-			c0.007,0.004,0.013,0.008,0.02,0.012h0c3.454,2.014,7.887,0.847,9.901-2.608c0.006-0.011,0.013-0.022,0.019-0.032l20.44-35.36
-			C303.91,33.682,302.737,29.25,299.28,27.24z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M127.76,323.96c-3.457-2.01-7.89-0.837-9.9,2.62l-20.44,35.36c-2.01,3.457-0.837,7.89,2.62,9.9s7.89,0.837,9.9-2.62
-			l20.44-35.36C132.39,330.402,131.217,325.97,127.76,323.96z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M75.12,271.32c-2.01-3.457-6.443-4.63-9.9-2.62l-35.36,20.44c-3.457,2.01-4.63,6.443-2.62,9.9
-			c2.01,3.457,6.443,4.63,9.9,2.62l35.36-20.44C75.957,279.209,77.13,274.777,75.12,271.32z"/>
-	</g>
-</g>
-</svg>
diff --git a/img/icons/temperature.svg b/img/icons/temperature.svg
deleted file mode 100644
index 0d99c43..0000000
--- a/img/icons/temperature.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="573.699px" height="573.699px" viewBox="0 0 573.699 573.699" style="enable-background:new 0 0 573.699 573.699;"
-	 xml:space="preserve">
-<g>
-	<g>
-		<path d="M305.949,424.6c0-1.9,0-1.9,0-3.799V133.9c0-11.5-7.6-19.1-19.099-19.1c-11.5,0-19.1,9.6-19.1,19.1v286.901
-			c0,1.898,0,1.898,0,3.799c-23,7.701-38.2,28.701-38.2,53.5c0,32.5,24.9,57.4,57.4,57.4c32.499,0,57.399-24.9,57.399-57.4
-			C344.25,453.301,328.949,432.301,305.949,424.6z"/>
-		<path d="M344.25,401.699V57.4c0-32.5-24.9-57.4-57.4-57.4c-32.5,0-57.4,26.8-57.4,57.4v344.2c-23,17.201-38.2,45.9-38.2,76.5
-			c0,53.5,42.1,95.6,95.6,95.6c53.5,0,95.599-42.1,95.599-95.6C382.449,447.5,367.15,418.9,344.25,401.699z M286.85,554.699
-			c-42.1,0-76.5-34.398-76.5-76.5c0-28.699,15.3-53.5,38.2-66.898V57.4c0-21,17.2-38.2,38.2-38.2s38.199,17.2,38.199,38.2v353.799
-			c23,13.4,38.201,38.201,38.201,66.9C363.35,520.199,328.949,554.699,286.85,554.699z"/>
-	</g>
-</g>
-</svg>
diff --git a/img/icons/test.html b/img/icons/test.html
deleted file mode 100644
index a12f730..0000000
--- a/img/icons/test.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-temperature">
-  <g transform="translate(0,-273)">
-    <g transform="matrix(.052866 0 0 .056274 -.1177 270.57)">
-     <path d="m226.99 76.385c-125.16 0-226.99 91.476-226.99 203.92 0 48.141 19.032 94.873 53.589 131.59 3.4131 3.6275 8.3011 5.7062 13.41 5.7062h319.98c5.1087 0 9.9976-2.0796 13.411-5.7062 34.557-36.716 53.588-83.45 53.588-131.59-1e-3 -112.44-101.83-203.92-226.99-203.92zm130.46 243.69c-1.8385-0.87304-3.8018-1.3172-5.8331-1.3172-5.0168 0-9.521 2.6582-11.756 6.9357-1.5607 2.9918-1.8095 6.3819-0.69642 9.551 1.1121 3.169 3.4521 5.7357 6.5885 7.2245l46.789 22.225c-3.642 5.6471-7.6436 11.115-12.006 16.354l-1.8035 2.1645h-303.49l-1.8045-2.1645c-4.807-5.7729-8.324-10.638-12.011-16.363l46.796-22.218c3.1354-1.4887 5.4754-4.0554 6.5875-7.2245 1.1131-3.1681 0.86528-6.5602-0.69641-9.551-2.2341-4.2784-6.7394-6.9376-11.755-6.9376-2.0323 0-3.9937 0.44414-5.8311 1.3172l-47.107 22.381c-8.7477-19.737-13.377-40.905-13.377-62.155 0-7.8173 0.61249-15.51 1.7715-23.049l45.493 6.6012c0.65845 0.0972 1.3289 0.14487 1.9963 0.14487 6.4116 0 11.975-4.5701 12.942-10.631 1.0871-6.8184-3.8448-13.211-10.994-14.25l-43.57-6.3219c9.3222-28.307 26.752-53.567 49.898-73.662l31.512 30.911c2.4909 2.4447 5.8301 3.7905 9.4041 3.7905 3.4341 0 6.6794-1.2581 9.1404-3.5417 2.5129-2.3303 3.9227-5.4536 3.9717-8.7952 0.049-3.3416-1.2689-6.5011-3.7109-8.8972l-29.622-29.057c28.303-18.439 62.511-30.125 99.597-32.371v42.439c0 6.8985 5.8841 12.511 13.115 12.511s13.114-5.6128 13.114-12.511v-42.438c37.086 2.2455 71.295 13.932 99.599 32.371l-29.623 29.058c-2.441 2.3961-3.7608 5.5556-3.7099 8.8972 0.049 3.3406 1.4578 6.4639 3.9697 8.7933 2.4629 2.2846 5.7102 3.5427 9.1424 3.5427 3.573 0 6.9122-1.3458 9.4041-3.7895l31.511-30.911c23.147 20.094 40.577 45.354 49.897 73.661l-43.569 6.3228c-7.148 1.0379-12.082 7.4303-10.993 14.249 0.96619 6.0598 6.5295 10.631 12.942 10.631 0.66744 0 1.3369-0.0486 1.9903-0.14297l45.499-6.603c1.159 7.539 1.7715 15.23 1.7715 23.05 0 21.255-4.6311 42.429-13.384 62.17z" fill="none" stroke="#000" stroke-width="4.8509"/>
-     <path d="m234.46 284.58-41.157-91.438c-0.89625-1.996-3.1124-3.138-5.3166-2.606-2.4909 0.601-4.0246 3.109-3.4241 5.602l23.468 97.497c-5.7762 6.966-7.8984 16.686-4.755 25.877 4.801 14.035 20.061 21.518 34.084 16.714 14.025-4.806 21.501-20.079 16.7-34.114-3.1424-9.192-10.771-15.572-19.601-17.532z" stroke-width=".99958"/>
-     <path d="m234.46 284.58-41.157-91.438c-0.89625-1.996-3.1124-3.138-5.3166-2.606-2.4909 0.601-4.0246 3.109-3.4241 5.602l23.468 97.497c-5.7762 6.966-7.8984 16.686-4.755 25.877 4.801 14.035 20.061 21.518 34.084 16.714 14.025-4.806 21.501-20.079 16.7-34.114-3.1424-9.192-10.771-15.572-19.601-17.532z" stroke-width=".99958"/>
-    </g>
-   </g></svg>
- <svg width="24" height="24" viewBox="0 0 24 24">
-  <g transform="translate(0,-273)">
-    <g transform="matrix(.052866 0 0 .056274 -.1177 270.57)">
-     <path d="m226.99 76.385c-125.16 0-226.99 91.476-226.99 203.92 0 48.141 19.032 94.873 53.589 131.59 3.4131 3.6275 8.3011 5.7062 13.41 5.7062h319.98c5.1087 0 9.9976-2.0796 13.411-5.7062 34.557-36.716 53.588-83.45 53.588-131.59-1e-3 -112.44-101.83-203.92-226.99-203.92zm130.46 243.69c-1.8385-0.87304-3.8018-1.3172-5.8331-1.3172-5.0168 0-9.521 2.6582-11.756 6.9357-1.5607 2.9918-1.8095 6.3819-0.69642 9.551 1.1121 3.169 3.4521 5.7357 6.5885 7.2245l46.789 22.225c-3.642 5.6471-7.6436 11.115-12.006 16.354l-1.8035 2.1645h-303.49l-1.8045-2.1645c-4.807-5.7729-8.324-10.638-12.011-16.363l46.796-22.218c3.1354-1.4887 5.4754-4.0554 6.5875-7.2245 1.1131-3.1681 0.86528-6.5602-0.69641-9.551-2.2341-4.2784-6.7394-6.9376-11.755-6.9376-2.0323 0-3.9937 0.44414-5.8311 1.3172l-47.107 22.381c-8.7477-19.737-13.377-40.905-13.377-62.155 0-7.8173 0.61249-15.51 1.7715-23.049l45.493 6.6012c0.65845 0.0972 1.3289 0.14487 1.9963 0.14487 6.4116 0 11.975-4.5701 12.942-10.631 1.0871-6.8184-3.8448-13.211-10.994-14.25l-43.57-6.3219c9.3222-28.307 26.752-53.567 49.898-73.662l31.512 30.911c2.4909 2.4447 5.8301 3.7905 9.4041 3.7905 3.4341 0 6.6794-1.2581 9.1404-3.5417 2.5129-2.3303 3.9227-5.4536 3.9717-8.7952 0.049-3.3416-1.2689-6.5011-3.7109-8.8972l-29.622-29.057c28.303-18.439 62.511-30.125 99.597-32.371v42.439c0 6.8985 5.8841 12.511 13.115 12.511s13.114-5.6128 13.114-12.511v-42.438c37.086 2.2455 71.295 13.932 99.599 32.371l-29.623 29.058c-2.441 2.3961-3.7608 5.5556-3.7099 8.8972 0.049 3.3406 1.4578 6.4639 3.9697 8.7933 2.4629 2.2846 5.7102 3.5427 9.1424 3.5427 3.573 0 6.9122-1.3458 9.4041-3.7895l31.511-30.911c23.147 20.094 40.577 45.354 49.897 73.661l-43.569 6.3228c-7.148 1.0379-12.082 7.4303-10.993 14.249 0.96619 6.0598 6.5295 10.631 12.942 10.631 0.66744 0 1.3369-0.0486 1.9903-0.14297l45.499-6.603c1.159 7.539 1.7715 15.23 1.7715 23.05 0 21.255-4.6311 42.429-13.384 62.17z" fill="none" stroke="#000" stroke-width="4.8509"/>
-     <path d="m234.46 284.58-41.157-91.438c-0.89625-1.996-3.1124-3.138-5.3166-2.606-2.4909 0.601-4.0246 3.109-3.4241 5.602l23.468 97.497c-5.7762 6.966-7.8984 16.686-4.755 25.877 4.801 14.035 20.061 21.518 34.084 16.714 14.025-4.806 21.501-20.079 16.7-34.114-3.1424-9.192-10.771-15.572-19.601-17.532z" stroke-width=".99958"/>
-     <path d="m234.46 284.58-41.157-91.438c-0.89625-1.996-3.1124-3.138-5.3166-2.606-2.4909 0.601-4.0246 3.109-3.4241 5.602l23.468 97.497c-5.7762 6.966-7.8984 16.686-4.755 25.877 4.801 14.035 20.061 21.518 34.084 16.714 14.025-4.806 21.501-20.079 16.7-34.114-3.1424-9.192-10.771-15.572-19.601-17.532z" stroke-width=".99958"/>
-    </g>
-   </g>
- </svg>
- <svg width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-temperature">
-  <circle vector-effect="non-scaling-stroke" cx="11.5" cy="12.5" r="8.5" fill="rgb(235,235,235)"/>  </svg>
- 
\ No newline at end of file
diff --git a/img/icons/twister.png b/img/icons/twister.png
deleted file mode 100644
index 43d7700..0000000
Binary files a/img/icons/twister.png and /dev/null differ
diff --git a/index.html b/index.html
index b58f7e0..6c83a5d 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,6 @@
   <!-- Required meta tags -->
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
   <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
   <link rel="icon" href="img/favicon.ico" type="image/x-icon">
 
@@ -14,35 +13,14 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="canonical" href="https://getbootstrap.com/docs/4.3/examples/offcanvas/">
 
-  <style>
-    .bd-placeholder-img {
-      font-size: 1.125rem;
-      text-anchor: middle;
-      -webkit-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-    }
-
-    @media (min-width: 768px) {
-      .bd-placeholder-img-lg {
-        font-size: 3.5rem;
-      }
-    }
-  </style>
   <!-- Custom styles for this template -->
   <link href="css/offcanvas.css" rel="stylesheet">
   <link href="css/dashboard.css" rel="stylesheet">
 
   <title>BlueWeather</title>
-
-
 </head>
 
-
 <body class="bg-ff">
-
-
   <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
     <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">BlueWeather</a>
 
@@ -53,7 +31,11 @@
     </ul>
   </nav>
 
+<<<<<<< Updated upstream
   <main role="main" class="container" style="padding-top: 30px;">
+=======
+  <main class="container" style="margin-top: 50px;">
+>>>>>>> Stashed changes
     <div class="d-flex align-items-center p-3 my-3 text-white-50 bg-blue rounded shadow-sm">
       <img class="mr-3" src="img/icon.png" alt="" width="48" height="48">
       <div class="lh-100">
@@ -64,6 +46,7 @@
 
     <div class="my-3 p-3 bg-white rounded shadow-sm">
       <h6 class="border-bottom border-gray pb-2 mb-0">current places</h6>
+<<<<<<< Updated upstream
       <div id="locationsList">
         <div class="media text-muted pt-3">
           <svg class="bd-placeholder-img mr-2 rounded" width="32" height="32" src="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 32x32">
@@ -72,11 +55,19 @@
           </svg>
           <p class="media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
             <strong class="d-block text-gray-dark">
+=======
+
+      <div class="media text-muted pt-3">
+        <a href="dashboard.html"><img class="mr-2" src="img/icons/1.png" width="50" height="50" alt="">
+          <p class="media-body pb-3 mb-0 lh-125 border-bottom border-gray">
+            <strong class="d-block">
+>>>>>>> Stashed changes
               <a href="dashboard.html">Stuttgart-Vaihingen</a>
             </strong>
             Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
             condimentum nibh, ut fermentum massa justo sit amet risus.
           </p>
+<<<<<<< Updated upstream
         </div>
         <div class="media text-muted pt-3">
           <!--  <svg class="bd-placeholder-img mr-2 rounded" width="32" height="32" xmlns="http://www.w3.org/2000/svg"
@@ -107,7 +98,33 @@
             condimentum nibh, ut fermentum massa justo sit amet risus.
           </p>
         </div>
+=======
       </div>
+
+      <div class="media text-muted pt-3">
+        <a href="dashboard.html"><img class="mr-2" src="img/icons/2.png" width="50" height="50" alt=""></a>
+        <rect width="100%" height="100%" fill="#e83e8c" /><text x="50%" y="50%" fill="#e83e8c" dy=".3em"></text>
+        <p class="media-body pb-3 mb-0 lh-125 border-bottom border-gray">
+          <strong class="d-block">
+            <a href="dashboard.html">Stuttgart-Rohr</a>
+          </strong>
+          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+          condimentum nibh, ut fermenerwrwrwetum massa justo sit amet risus.
+        </p>
+      </div>
+
+      <div class="media text-muted pt-3">
+        <a href="dashboard.html"><img class="mr-2" src="img/icons/6.png" width="50" height="50" alt=""></a>
+        <p class="media-body pb-3 mb-0 lh-125 border-bottom border-gray">
+          <strong class="d-block">
+            <a href="dashboard.html">@place</a>
+          </strong>
+          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+          condimentum nibh, ut fermentum massa justo sit amet risus.
+        </p>
+>>>>>>> Stashed changes
+      </div>
+
     </div>
   </main>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -120,9 +137,12 @@
   <script src="js/blueweather.js"></script>
   <script src="js/index.js"></script>
 </body>
+<<<<<<< Updated upstream
 
 
 </body>
 
 
+=======
+>>>>>>> Stashed changes
 </html>
\ No newline at end of file