diff --git a/django_projects/metrics/dashboard/views.py b/django_projects/metrics/dashboard/views.py
index 11c6920..1604222 100644
--- a/django_projects/metrics/dashboard/views.py
+++ b/django_projects/metrics/dashboard/views.py
@@ -78,16 +78,27 @@ def heatmap(request):
 		item.hover += 'Beg <div style="height: 4px;"></div>'				
 		item.hover += '</div>'
 		
+		if data == 'perc':
+			item.hover += '<div style="float: left; width: 77%; font-size: 10px; line-height: 1.4em; color: #EFEFEF;">'
+			item.hover += '<div style="height: 4px;"></div>'
+			item.hover += '<div style="background-color:' + item_advanced.heat_perc() +'; height: 15px; width:' + str(advanced) + '; padding-left: 2px;">' + str(advanced) + '</div>'
+			item.hover += '<div style="height: 3px;"></div>'
+			item.hover += '<div style="background-color:' + item_intermediate.heat_perc() +'; height: 15px; width:' + str(beginner) + '; padding-left: 2px;">' + str(beginner) + '</div>'
+			item.hover += '<div style="height: 3px;"></div>'
+			item.hover += '<div style="background-color:' + item_beginner.heat_perc() +'; height: 15px; width:' + str(intermediate) + '; padding-left: 2px;">' + str(intermediate) + '</div>'						
+			item.hover += '</div>'
+			item.hover += '<div style="height: 0px; clear: both;"></div>'
+		else:
+			item.hover += '<div style="float: left; width: 77%; font-size: 11px; line-height: 1.4em; ">'		
+			item.hover += '<div style="height: 3px;"></div>'
+			item.hover += str(advanced)
+			item.hover += '<div style="height: 3px;"></div>'
+			item.hover += str(intermediate)
+			item.hover += '<div style="height: 3px;"></div>'
+			item.hover += str(beginner)			
+			item.hover += '</div>' 						
+			item.hover += '<div style="height: 0px; clear: both;"></div>'
 		
-		item.hover += '<div style="float: left; width: 77%; font-size: 10px; line-height: 1.4em;">'
-		item.hover += '<div style="height: 4px;"></div>'
-		item.hover += '<div style="background-color:' + item_advanced.heat_perc() +'; height: 15px; width:' + str(advanced) + '; padding-left: 2px;">' + str(advanced) + '</div>'
-		item.hover += '<div style="height: 3px;"></div>'
-		item.hover += '<div style="background-color:' + item_intermediate.heat_perc() +'; height: 15px; width:' + str(beginner) + '; padding-left: 2px;">' + str(beginner) + '</div>'
-		item.hover += '<div style="height: 3px;"></div>'
-		item.hover += '<div style="background-color:' + item_beginner.heat_perc() +'; height: 15px; width:' + str(intermediate) + '; padding-left: 2px;">' + str(intermediate) + '</div>'						
-		item.hover += '</div>'
-		item.hover += '<div style="height: 0px; clear: both;"></div>'
 		
 		
 		if data == 'freq':
diff --git a/django_templates/heatmap.html b/django_templates/heatmap.html
index c3c5154..6377a39 100644
--- a/django_templates/heatmap.html
+++ b/django_templates/heatmap.html
@@ -24,6 +24,7 @@
 		{% endif %}		
 	</ul>	
 	
+	<!--
 	<ul>
 		<li><a href='?t=all&d={{ data }}' class="button left {% if all_hours %}active{% endif %}">All Hours</a></li>
 		{% if all_skills %}
@@ -36,6 +37,7 @@
 		<li><a href='#' class="button inactive right">&nbsp;&nbsp; 6 + &nbsp;&nbsp;</a></li>		
 		{% endif %}		
 	</ul>
+	-->
 		
 	<ul id='checkboxes'>
 		<li>
@@ -193,11 +195,11 @@
 				<div class='item_details' style='left: 145px;'>
 					<div class="menu_arrow" style="left: 10px;">◢◣</div>
 					<div class="menu_arrow_mask" style="left: 8.5px;"></div>
-					{{ site_id_normal.hover|safe }}
-					<div style='height: 15px;'></div>
-					{{ site_id_ev.hover|safe }}					
-					<div style='height: 15px;'></div>
-					{{ site_id_ssl.hover|safe }}						
+					{{ site_id_normal.hover|safe }}			
+					<div style='height: 20px;'></div>
+					{{ site_id_ssl.hover|safe }}	
+					<div style='height: 20px;'></div>
+					{{ site_id_ev.hover|safe }}												
 				</div>
 			</div>
 				
@@ -207,7 +209,7 @@
 					<div class="menu_arrow" style="left: 10px;">◢◣</div>
 					<div class="menu_arrow_mask" style="left: 8.5px;"></div>
 					{{ url_enter_key.hover|safe }}
-					<div style='height: 15px;'></div>					
+					<div style='height: 20px;'></div>					
 					{{ url_search_enter_key.hover|safe }}
 				</div>
 			</div>
@@ -236,7 +238,7 @@
 					<div class="menu_arrow" style="left: 10px;">◢◣</div>
 					<div class="menu_arrow_mask" style="left: 8.5px;"></div>
 					{{ url_go_button.hover|safe }}
-					<div style='height: 15px;'></div>					
+					<div style='height: 20px;'></div>					
 					{{ url_search_go_button.hover|safe }}					
 				</div>
 			</div>
diff --git a/media/css/heatmap.css b/media/css/heatmap.css
index 8a93613..65b6361 100644
--- a/media/css/heatmap.css
+++ b/media/css/heatmap.css
@@ -30,7 +30,7 @@ html {
 	display: none;
 	position: absolute;
 	width: 250px;
-	padding: 12px 15px;
+	padding: 13px 16px 20px;
 	margin: 35px 0 0 -15px;
 	background-color: white;
 	color: #444;