diff --git a/templates/layout.html b/templates/layout.html
index 7d5c456..f836e4f 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -55,8 +55,10 @@
                     </p>
                      <ul class="menu-list">
 						<li>
-							<a href="/room"><span class="tag {{room.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{room.temp}} °C </span></a>
-							<a href="/room"><span class="tag {{room.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{room.warm}} % </span></a>
+							<a href="/room">
+								<span class="tag {{room.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{room.temp}} °C </span>
+								<span class="tag {{room.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{room.warm}} % </span>
+							</a>
 						</li>
 					</ul>
                     <p class="menu-label">
@@ -64,8 +66,10 @@
                     </p>
                     <ul class="menu-list">
 	                    <li>
-							<a href="/cellar"><span class="tag {{cellar.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{cellar.temp}} °C </span></a>
-							<a href="/cellar"><span class="tag {{cellar.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{cellar.warm}} % </span></a>
+							<a href="/cellar">
+								<span class="tag {{cellar.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{cellar.temp}} °C </span>
+								<span class="tag {{cellar.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{cellar.warm}} % </span>
+							</a>
 						</li>
 					</ul>
 					<p class="menu-label">
@@ -73,8 +77,10 @@
                     </p>
                     <ul class="menu-list">
 	                    <li>
-							<a href="/weather"><span class="tag {{weather.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{weather.temp}} °C </span></a>
-							<a href="/weather"><span class="tag {{weather.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{weather.warm}} % </span></a>
+							<a href="/weather">
+								<span class="tag {{weather.temp_status}} is-large"><i class="fa fa-thermometer-three-quarters fa-fw" aria-hidden="true"></i>{{weather.temp}} °C </span>
+								<span class="tag {{weather.warm_status}} is-large"><i class="fa fa-tint fa-fw" aria-hidden="true"></i>{{weather.warm}} % </span>
+							</a>
 						</li>
 					</ul>
 				</nav>