diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1061598..6edc4aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,7 @@
 ## [1.0.8] - 2016-5-25
 
 ### Added
-- Sponsorship logic
-- New logo
+- Styles Updates
 - SSL Default
 
 ## [1.0.7] - 2015-11-13
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index a8d00dd..2c17a6b 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -162,7 +162,7 @@ mailHops.getRoute = function(){
 
   var received_ips;
   var all_ips = new Array();
-  var rline='';
+  var rline = '';
   //empty secure
   mailHops.message.secure = [];
 
@@ -170,7 +170,7 @@ mailHops.getRoute = function(){
       mailHopsDisplay.lists( headListUnsubscribe );
   }
 
-  if(mailHops.options.show_lists){
+  if(mailHops.options.show_auth){
       mailHopsDisplay.auth( headXMailer, headUserAgent, headXMimeOLE, headAuth, headReceivedSPF );
   }
 
diff --git a/chrome/content/mailhopsMap.xul b/chrome/content/mailhopsMap.xul
index defe109..708b33f 100644
--- a/chrome/content/mailhopsMap.xul
+++ b/chrome/content/mailhopsMap.xul
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mailhops/skin/pb-styles.css" type="text/css"?>
 
 <dialog id="mailHopsMap"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -10,12 +11,12 @@
 	buttonlabelcancel="Close">
 
 <iframe id="mailhops_iframe" flex="1" width="1024" height="768" style="overflow:hidden;" type="content"></iframe>
-		
+
 <script>
 function loadMap(){
-	var args = window.arguments[0]; 
+	var args = window.arguments[0];
 	document.getElementById('mailhops_iframe').setAttribute('src',args.src);
 }
 </script>
-		
-</dialog>
\ No newline at end of file
+
+</dialog>
diff --git a/chrome/content/pb-overlay.js b/chrome/content/pb-overlay.js
index a8d5741..904f835 100644
--- a/chrome/content/pb-overlay.js
+++ b/chrome/content/pb-overlay.js
@@ -4,7 +4,6 @@ var mailHopsDisplay =
   resultTextDataPane2:		null,
   resultTextDataPane3:      null,
   resultContainerDataPane:	null,
-  resultDetailsLink:		null,
   resultContainerDetails: 	null,
   resultDetails:			null,
   resultMapLink:			null,
@@ -23,49 +22,37 @@ var mailHopsDisplay =
   	  this.options = options;
 
   	  this.resultContainerDataPane = document.getElementById ( "mailhopsDataPane");
-	  this.resultTextDataPane = document.getElementById ( "mailhopsDataPaneText");
-	  this.resultTextDataPane2 = document.getElementById ( "mailhopsDataPaneText2");
-	  this.resultTextDataPane3 = document.getElementById ( "mailhopsDataPaneText3");
+  	  this.resultTextDataPane = document.getElementById ( "mailhopsDataPaneText");
+  	  this.resultTextDataPane2 = document.getElementById ( "mailhopsDataPaneText2");
+  	  this.resultTextDataPane3 = document.getElementById ( "mailhopsDataPaneText3");
 
-	  this.resultDetailsLink = document.getElementById ( "mailhopsDataPaneDetailsLink");
-	  this.resultContainerDetails = document.getElementById ( "mailhopsDetailsContainer");
-	  this.resultDetails = document.getElementById ( "mailhopsDataPaneDetails");
-	  this.resultMeta = document.getElementById ( "mailhopsDataPaneMeta");
-	  this.resultMapLink = document.getElementById ( "mailhopsDataPaneMapLink");
+  	  this.resultContainerDetails = document.getElementById ( "mailhopsDetailsContainer");
+  	  this.resultDetails = document.getElementById ( "mailhopsDataPaneDetails");
+  	  this.resultMeta = document.getElementById ( "mailhopsDataPaneMeta");
+  	  this.resultMapLink = document.getElementById ( "mailhopsDataPaneMapLink");
 
-	  //auth
-	  this.mailhopsAuthContainer = document.getElementById ( "dataPaneMailHopsAuthContainer");
-	  this.mailhopsDataPaneSPF = document.getElementById ( "mailhopsDataPaneSPF");
-	  this.mailhopsDataPaneDKIM = document.getElementById ( "mailhopsDataPaneDKIM");
-	  this.mailhopsDataPaneMailer = document.getElementById ( "mailhopsDataPaneMailer");
-	  this.mailhopsDataPaneDNSBL = document.getElementById ( "mailhopsDataPaneDNSBL");
-	  //list
-	  this.mailhopsListContainer = document.getElementById ( "dataPaneMailHopsListContainer");
+  	  //auth
+  	  this.mailhopsAuthContainer = document.getElementById ( "dataPaneMailHopsAuthContainer");
+  	  this.mailhopsDataPaneSPF = document.getElementById ( "mailhopsDataPaneSPF");
+  	  this.mailhopsDataPaneDKIM = document.getElementById ( "mailhopsDataPaneDKIM");
+  	  this.mailhopsDataPaneMailer = document.getElementById ( "mailhopsDataPaneMailer");
+  	  this.mailhopsDataPaneDNSBL = document.getElementById ( "mailhopsDataPaneDNSBL");
+  	  //list
+  	  this.mailhopsListContainer = document.getElementById ( "dataPaneMailHopsListContainer");
 
-	  this.resultListDataPane = document.getElementById ( "mailhopsListDataPane");
+  	  this.resultListDataPane = document.getElementById ( "mailhopsListDataPane");
 
-	  if(this.options.show_meta)
- 	    document.getElementById('dataPaneMailHopsMetaContainer').style.display='';
- 	  else
- 	  	document.getElementById('dataPaneMailHopsMetaContainer').style.display='none';
+  	  if(this.options.show_meta)
+   	    document.getElementById('dataPaneMailHopsMetaContainer').style.display='';
+   	  else
+   	  	document.getElementById('dataPaneMailHopsMetaContainer').style.display='none';
 
-	  //event listner for route click to launch map
-	  this.resultMapLink.addEventListener("click", function () {
+  	  //event listner for route click to launch map
+  	  this.resultMapLink.addEventListener("click", function () {
 	  		if(this.hasAttribute("data-route"))
 		  		mailHopsUtils.launchMap( String(this.getAttribute("data-route")), options );
 	  	});
 
-	  var resultContainerDetails = this.resultContainerDetails;
-	  this.resultDetailsLink.addEventListener("click", function () {
-	  		if(resultContainerDetails.style.display=='none'){
-		  		resultContainerDetails.style.display = 'block';
-		  		this.setAttribute('class','text-link dataPaneMoreLink active');
-		  	} else {
-		  		resultContainerDetails.style.display = 'none';
-		  		this.setAttribute('class','text-link dataPaneMoreLink');
-		  	}
-	  	});
-
 	  this.mailhopsDataPaneDNSBL.addEventListener("click", function () {
 			if(this.hasAttribute('data-ip'))
 		  		mailHopsUtils.launchSpamHausURL(this.getAttribute('data-ip'));
@@ -238,32 +225,36 @@ var mailHopsDisplay =
 
   clear: function(no_ips){
   	this.resultTextDataPane2.style.display = 'none';
-	this.resultContainerDetails.style.display = 'none';
-	this.resultDetailsLink.style.display = 'none';
-	this.resultMapLink.style.display = 'none';
-	this.mailhopsDataPaneDNSBL.style.display = 'none';
+  	this.resultContainerDetails.style.display = 'none';
+  	this.resultMapLink.style.display = 'none';
+  	this.mailhopsDataPaneDNSBL.style.display = 'none';
 
-	if(no_ips){
-		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/help.png)';
-		this.resultTextDataPane.value = ' No IPs';
-		this.resultTextDataPane.setAttribute('tooltiptext','There were no received headers found');
-	} else {
-		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
-		this.resultTextDataPane.value = ' Looking Up Route';
-		this.resultTextDataPane.setAttribute('tooltiptext','Looking Up Route');
-	}
+  	if(no_ips){
+  		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/help.png)';
+  		this.resultTextDataPane.value = ' No IPs';
+  		this.resultTextDataPane.setAttribute('tooltiptext','There were no received headers found');
+  	} else {
+  		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
+  		this.resultTextDataPane.value = ' Looking Up Route';
+  		this.resultTextDataPane.setAttribute('tooltiptext','Looking Up Route');
+  	}
 
-	this.resultTextDataPane2.value = '';
-	this.resultTextDataPane2.style.backgroundImage = '';
-	this.resultTextDataPane2.setAttribute('tooltiptext','');
+  	this.resultTextDataPane2.value = '';
+  	this.resultTextDataPane2.style.backgroundImage = '';
+  	this.resultTextDataPane2.setAttribute('tooltiptext','');
 
-    this.resultTextDataPane3.style.display = 'none';
-    this.resultTextDataPane3.value = '';
+      this.resultTextDataPane3.style.display = 'none';
+      this.resultTextDataPane3.value = '';
 
-	//remove child details
-	while(this.resultDetails.firstChild) {
-    	this.resultDetails.removeChild(this.resultDetails.firstChild);
-	}
+  	//remove child details
+  	while(this.resultDetails.firstChild) {
+      	this.resultDetails.removeChild(this.resultDetails.firstChild);
+  	}
+    if(this.options.show_meta){
+ 	    while(this.resultMeta.firstChild) {
+    		this.resultMeta.removeChild(this.resultMeta.firstChild);
+  		}
+    }
   },
 
   route: function(header_route, message, response, meta, lookup_url){
@@ -282,10 +273,7 @@ var mailHopsDisplay =
 
   	//append meta
 	if(this.options.show_meta){
- 	    while(this.resultMeta.firstChild) {
-    		this.resultMeta.removeChild(this.resultMeta.firstChild);
-  		}
-  		for(var index in meta){
+ 			for(var index in meta){
 			var mlabel = document.createElement('label');
 			mlabel.setAttribute('value',index+': '+meta[index]);
 			this.resultMeta.appendChild(mlabel);
@@ -466,17 +454,8 @@ var mailHopsDisplay =
   }
 
   //show the detail link
-  this.resultDetailsLink.style.display = 'block';
   this.resultMapLink.style.display = 'block';
-  //show details by default
-  if(this.options.show_details){
-  	this.resultContainerDetails.style.display = 'block';
-  	this.resultDetailsLink.setAttribute('class','text-link dataPaneMoreLink active');
-  }
-  else{
-  	this.resultContainerDetails.style.display = 'none';
-  	this.resultDetailsLink.setAttribute('class','text-link dataPaneMoreLink');
-  }
+  this.resultContainerDetails.style.display = 'block';
 
 	} //end route
 };
diff --git a/chrome/content/pb-overlay.xul b/chrome/content/pb-overlay.xul
index e3882c2..1e9a605 100644
--- a/chrome/content/pb-overlay.xul
+++ b/chrome/content/pb-overlay.xul
@@ -3,7 +3,7 @@
 
 <?xml-stylesheet href="chrome://mailhops/skin/pb-styles.css" type="text/css"?>
 
-<overlay id="mailhopsOverlay" 
+<overlay id="mailhopsOverlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml">
 
@@ -12,33 +12,32 @@
 	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
 
 	<vbox id="dataPane2">
-		<vbox id="dataPaneMailHopsContainer" class="dataPaneBox">	
+		<vbox id="dataPaneMailHopsContainer" class="dataPaneBox">
 			<hbox flex="1" pack="start" align="center">
 				<label class="dataPaneHeader" crop="right" value="&mailhops_header_route_label;"></label>
 				<separator class="dataPaneBoxSeparator" flex="1"></separator>
 			</hbox>
-			
+
+      <hbox class="mailHopsLinkContainer">
+				<vbox><button id="mailhopsDataPaneMapLink" class="navButton">&mailhops_route_nav_map_label;</button></vbox>
+				<vbox><button id="mailhopsDataPaneRefreshLink" class="navButton">&mailhops_route_nav_refresh_label;</button></vbox>
+				<vbox><button id="mailhopsDataPanePrefsLink" class="navButton">&mailhops_route_nav_options_label;</button></vbox>
+			</hbox>
+
 			<vbox id="mailhopsDataPane" flex="1">
 				<label id="mailhopsDataPaneText" class="dataPaneAddressitem" tooltiptext=""></label>
 				<label id="mailhopsDataPaneText2" class="dataPaneAddressitem" tooltiptext=""></label>
-				<label id="mailhopsDataPaneText3" class="dataPaneAddressitem" tooltiptext=""></label>				
-			</vbox>	
-			
-			<hbox class="mailHopsLinkContainer">
-				<vbox><label id="mailhopsDataPaneMapLink" class="text-link dataPaneMoreLink" value="&mailhops_route_nav_map_label;" tooltiptext="&mailhops_route_nav_map_tip;"></label></vbox>
-				<vbox><label id="mailhopsDataPaneDetailsLink" class="text-link dataPaneMoreLink" value="&mailhops_route_nav_details_label;" tooltiptext="&mailhops_route_nav_details_tip;"></label></vbox>				
-				<vbox><label id="mailhopsDataPaneRefreshLink" class="text-link dataPaneMoreLink" value="&mailhops_route_nav_refresh_label;" tooltiptext="&mailhops_route_nav_refresh_tip;"></label></vbox>								
-				<vbox><label id="mailhopsDataPanePrefsLink" class="text-link dataPaneMoreLink" value="&mailhops_route_nav_options_label;" tooltiptext="&mailhops_route_nav_options_tip;"></label></vbox>
-			</hbox>
-			
+				<label id="mailhopsDataPaneText3" class="dataPaneAddressitem" tooltiptext=""></label>
+			</vbox>
+
 			<hbox id="mailhopsDetailsContainer" class="mailhopsContainer">
-				<vbox id="mailhopsDataPaneDetails" flex="1">	
+				<vbox id="mailhopsDataPaneDetails" flex="1">
 				</vbox>
 			</hbox>
-			
-		</vbox>	
-		
-		<vbox id="dataPaneMailHopsAuthContainer" class="dataPaneBox">	
+
+		</vbox>
+
+		<vbox id="dataPaneMailHopsAuthContainer" class="dataPaneBox">
 			<hbox flex="1" pack="start" align="center">
 				<label class="dataPaneHeader" crop="right" value="&mailhops_header_auth_label;"></label>
 				<separator class="dataPaneBoxSeparator" flex="1"></separator>
@@ -50,24 +49,24 @@
 				<label id="mailhopsDataPaneDKIM" class="dataPaneAddressitem auth-item" value="" tooltiptext="DKIM"></label>
 				<label id="mailhopsDataPaneDNSBL" class="text-link dataPaneAddressitem auth-item" value="" tooltiptext="DNSBL"></label>
 			</vbox>
-		</vbox>	
-		
-		<vbox id="dataPaneMailHopsListContainer" class="dataPaneBox">	
+		</vbox>
+
+		<vbox id="dataPaneMailHopsListContainer" class="dataPaneBox">
 			<hbox flex="1" pack="start" align="center">
 				<label class="dataPaneHeader" crop="right" value="&mailhops_header_lists_label;"></label>
 				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>			
-			<vbox id="mailhopsListDataPane" flex="1"></vbox>				
-		</vbox>	
-		
-		<vbox id="dataPaneMailHopsMetaContainer" class="dataPaneBox">	
+			</hbox>
+			<vbox id="mailhopsListDataPane" flex="1"></vbox>
+		</vbox>
+
+		<vbox id="dataPaneMailHopsMetaContainer" class="dataPaneBox">
 			<hbox flex="1" pack="start" align="center">
 				<label class="dataPaneHeader" crop="right" value="&mailhops_header_meta_label;"></label>
 				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>			
+			</hbox>
 			<vbox id="mailhopsDataPaneMeta" flex="1"></vbox>
 		</vbox>
-		
+
 	</vbox>
-	
+
 </overlay>
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index bc92bd9..a4e67db 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -27,11 +27,6 @@ var mailHopPreferences = {
 	    document.getElementById("mailhop.unit").selectedIndex = 1;
 
 	//Display Box Options
-	if(pref.getCharPref("mail.mailHops.show_details",'true')=='true')
-		document.getElementById("mailhop.show_details").checked = true;
-	else
-		document.getElementById("mailhop.show_details").checked = false;
-
 	if(pref.getCharPref("mail.mailHops.show_meta",'true')=='true')
 		document.getElementById("mailhop.show_meta").checked = true;
 	else
@@ -102,7 +97,6 @@ var mailHopPreferences = {
     pref.setCharPref("mail.mailHops.lang", document.getElementById("mailhop.lang").selectedItem.value);
     pref.setCharPref("mail.mailHops.map_provider", document.getElementById("mailhop.map_provider").selectedItem.value);
     pref.setCharPref("mail.mailHops.unit", document.getElementById("mailhop.unit").selectedItem.value);
-    pref.setCharPref("mail.mailHops.show_details", String(document.getElementById("mailhop.show_details").checked));
     pref.setCharPref("mail.mailHops.show_meta", String(document.getElementById("mailhop.show_meta").checked));
     pref.setCharPref("mail.mailHops.show_host", String(document.getElementById("mailhop.show_host").checked));
     pref.setCharPref("mail.mailHops.show_secure", String(document.getElementById("mailhop.show_secure").checked));
@@ -124,11 +118,10 @@ var mailHopPreferences = {
 
     return true;
   }
+
 };
 
 function TestConnection(e){
-	e.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
-
 	var xmlhttp = new XMLHttpRequest();
 	var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
 	var lookupURL = mailHopPreferences.api_url.value;
@@ -162,15 +155,13 @@ function TestConnection(e){
 
 function ResetLocation(e){
 
-	e.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
-
 	//clear the location
 	document.getElementById("mailhop.client_location").value='Getting your location...';
 	document.getElementById("mailhop.client_location_ip").value = '';
 	document.getElementById("mailhop.client_location_host").value = '';
 	document.getElementById("mailhop.client_location_whois").value = '';
 
-  var MH_APIURL = mailHopPreferences.api_ssl.value=="true"?'https://'+mailHopPreferences.api_url:'http://'+mailHopPreferences.api_url;
+  var MH_APIURL = mailHopPreferences.api_ssl.value=="true"?'https://'+mailHopPreferences.api_url.value:'http://'+mailHopPreferences.api_url.value;
 
 	mailHops.setClientLocation(function(response){
 
@@ -202,9 +193,7 @@ function ResetLocation(e){
 			if(response.route[0].countryCode)
 			   	document.getElementById("mailhop.client_location").style.backgroundImage='url(chrome://mailhops/content/images/flags/'+response.route[0].countryCode.toLowerCase()+'.png)';
 
-			e.style.backgroundImage='';
 		} else {
-			e.style.backgroundImage='';
 			document.getElementById("mailhop.client_location").value='Failed connecting...';
 		}
 	},MH_APIURL);
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 3d4a1d5..8244ee1 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -24,7 +24,7 @@
 	  </tabs>
 	  <tabpanels>
 	    <tabpanel>
-	    	<groupbox>
+	    	<groupbox flex="1">
 			<caption label="Default Language"/>
 			<radiogroup id="mailhop.lang">
 				<radio value="en" label="English" selected="true"/>
@@ -38,7 +38,7 @@
 			</radiogroup>
 			</groupbox>
 
-			<groupbox>
+			<groupbox flex="1">
 				<caption label="Default Units"/>
 				<radiogroup id="mailhop.unit">
 					<radio value="mi" label="Miles and ºF" selected="true"/>
@@ -46,7 +46,7 @@
 				</radiogroup>
 			</groupbox>
 
-			<groupbox>
+			<groupbox flex="1">
 				<caption label="Default Map"/>
 				<menulist id="mailhop.map_provider">
 					<menupopup>
@@ -155,20 +155,19 @@
 			</groupbox>
 	    </tabpanel>
 	    <tabpanel>
-	    	<groupbox>
+	    	<groupbox flex="1">
 				<caption label="Display Boxes"/>
-				<checkbox id="mailhop.show_details" label="Show Details" checked="true"/>
 				<checkbox id="mailhop.show_auth" label="Show Auth" checked="true"/>
 				<checkbox id="mailhop.show_lists" label="Show Unsubscribe Links" checked="true"/>
 				<checkbox id="mailhop.show_meta" label="Show Meta" checked="true"/>
 			</groupbox>
-			<groupbox>
-				<caption label="Details menuitems"/>
+			<groupbox flex="1">
+				<caption label="Details menu items"/>
 				<label class="mailhopsHostPref"><checkbox id="mailhop.show_host" label="Show Host" checked="true"/></label>
 				<label class="mailhopsSecurePref"><checkbox id="mailhop.show_secure" label="Show Secure Transmission" checked="true"/></label>
 			</groupbox>
-			<groupbox>
-				<caption label="Authentication menuitems"/>
+			<groupbox flex="1">
+				<caption label="Authentication menu items"/>
 				<checkbox id="mailhop.show_mailer" label="Show Mailer" checked="true"/>
 				<checkbox id="mailhop.show_spf" label="Show SPF" checked="true"/>
 				<checkbox id="mailhop.show_dkim" label="Show DKIM" checked="true"/>
@@ -179,10 +178,10 @@
 	    <tabpanel>
 	    	<groupbox>
 				<caption label="MailHops API Hosting"/>
-				<description>
+				<!-- <description>
 					MailHops API hosting is sponsored by
 					<image src="https://mailhops.com/images/sponsor.png" width="200"/>
-				</description>
+				</description> -->
 
 				<grid flex="1">
 				  <columns>
@@ -199,13 +198,16 @@
 								</menulist>
 								<textbox id="mailhop.api_url" value="api.mailhops.com" flex="1"/>
 							</row>
+							<row>
+								<hbox/>
+								<hbox flex="1">
+									<button onclick="TestConnection(this);">Test Connection</button>
+									<button onclick="ResetConnection();">Reset Connection</button>
+								</hbox>
+							</row>
 						</rows>
 				</grid>
 
-				<label class="text-link plain act" onclick="TestConnection(this);" value="Test Connection" />
-
-				<label class="text-link plain act" onclick="ResetConnection();" value="Reset Connection" />
-
 				<description>
 					MailHops API uses <label class="text-link plain" value="Forecast.IO" href="https://developer.forecast.io/"/> to get the weather of the sender, register for an API Key to enable this feature.
 				</description>
@@ -217,16 +219,17 @@
 	    </tabpanel>
 
 	    <tabpanel>
-	    	<groupbox>
-				<caption label="Your Location"/>
+	    	<groupbox flex="1">
 				<description>
-					Is cached on startup and clicking refresh below to reduce the number of lookups by one.
+					Your Location is cached on startup and clicking refresh below to reduce the number of lookups by one.
+				</description>
+				<description>
+					<button id="mailhop.refresh_location" onclick="ResetLocation(this);">Refresh your location</button>
 				</description>
 				<label id="mailhop.client_location" class="act" value="Not Set" />
 				<label id="mailhop.client_location_ip" class="plain act" value="" />
 				<label id="mailhop.client_location_host" class="plain act" value="" />
 				<label id="mailhop.client_location_whois" class="text-link plain act" value="whois" tooltiptext="Click for whois" />
-				<label id="mailhop.refresh_location" class="text-link plain act" onclick="ResetLocation(this);" value="Refresh your location" />
 			</groupbox>
 	    </tabpanel>
 
diff --git a/chrome/locale/de/strings.dtd b/chrome/locale/de/strings.dtd
index 6c6d782..26d30e4 100644
--- a/chrome/locale/de/strings.dtd
+++ b/chrome/locale/de/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "Einzelheiten">
 <!ENTITY mailhops_route_nav_refresh_label      "erfrischen">
 <!ENTITY mailhops_route_nav_options_label      "Optionen">
-
-<!ENTITY mailhops_route_nav_map_tip          "Karte anzeigen">
-<!ENTITY mailhops_route_nav_details_tip      "Zeige Details">
-<!ENTITY mailhops_route_nav_refresh_tip      "Aktualisieren Cache">
-<!ENTITY mailhops_route_nav_options_tip      "Einstellungen">
\ No newline at end of file
diff --git a/chrome/locale/de/strings.properties b/chrome/locale/de/strings.properties
index 19ab8c1..e5d983b 100644
--- a/chrome/locale/de/strings.properties
+++ b/chrome/locale/de/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=Karte
 mailhops_route_nav_details_label=Einzelheiten
 mailhops_route_nav_refresh_label=erfrischen
 mailhops_route_nav_options_label=Optionen
-mailhops_route_nav_map_tip=Karte anzeigen
-mailhops_route_nav_details_tip=Zeige Details
-mailhops_route_nav_refresh_tip=Aktualisieren Cache
-mailhops_route_nav_options_tip=Einstellungen
\ No newline at end of file
diff --git a/chrome/locale/en/strings.dtd b/chrome/locale/en/strings.dtd
index b0ecbca..685a058 100644
--- a/chrome/locale/en/strings.dtd
+++ b/chrome/locale/en/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "details">
 <!ENTITY mailhops_route_nav_refresh_label      "refresh">
 <!ENTITY mailhops_route_nav_options_label      "options">
-
-<!ENTITY mailhops_route_nav_map_tip          "Show Map">
-<!ENTITY mailhops_route_nav_details_tip      "Show Details">
-<!ENTITY mailhops_route_nav_refresh_tip      "Refresh Cache">
-<!ENTITY mailhops_route_nav_options_tip      "Preferences">
\ No newline at end of file
diff --git a/chrome/locale/en/strings.properties b/chrome/locale/en/strings.properties
index 198d639..b557e7a 100644
--- a/chrome/locale/en/strings.properties
+++ b/chrome/locale/en/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=map
 mailhops_route_nav_details_label=details
 mailhops_route_nav_refresh_label=refresh
 mailhops_route_nav_options_label=options
-mailhops_route_nav_map_tip=Show Map
-mailhops_route_nav_details_tip=Show Details
-mailhops_route_nav_refresh_tip=Refresh Cache
-mailhops_route_nav_options_tip=Preferences
\ No newline at end of file
diff --git a/chrome/locale/es/strings.dtd b/chrome/locale/es/strings.dtd
index 823319d..70910cb 100644
--- a/chrome/locale/es/strings.dtd
+++ b/chrome/locale/es/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "detalles">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
 <!ENTITY mailhops_route_nav_options_label      "opciones">
-
-<!ENTITY mailhops_route_nav_map_tip          "Ver mapa">
-<!ENTITY mailhops_route_nav_details_tip      "Mostrar Detalles">
-<!ENTITY mailhops_route_nav_refresh_tip      "Actualizar caché">
-<!ENTITY mailhops_route_nav_options_tip      "Preferencias">
\ No newline at end of file
diff --git a/chrome/locale/es/strings.properties b/chrome/locale/es/strings.properties
index 408bb6d..f1e5788 100644
--- a/chrome/locale/es/strings.properties
+++ b/chrome/locale/es/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalles
 mailhops_route_nav_refresh_label=refrescar
 mailhops_route_nav_options_label=opciones
-mailhops_route_nav_map_tip=Ver mapa
-mailhops_route_nav_details_tip=Mostrar Detalles
-mailhops_route_nav_refresh_tip=Actualizar caché
-mailhops_route_nav_options_tip="Preferencias
\ No newline at end of file
diff --git a/chrome/locale/fr/strings.dtd b/chrome/locale/fr/strings.dtd
index bf3b26f..85e8c5d 100644
--- a/chrome/locale/fr/strings.dtd
+++ b/chrome/locale/fr/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "détails">
 <!ENTITY mailhops_route_nav_refresh_label      "rafraîchir">
 <!ENTITY mailhops_route_nav_options_label      "les options">
-
-<!ENTITY mailhops_route_nav_map_tip          "Voir la carte">
-<!ENTITY mailhops_route_nav_details_tip      "Afficher Les Détails">
-<!ENTITY mailhops_route_nav_refresh_tip      "Actualiser Cache">
-<!ENTITY mailhops_route_nav_options_tip      "préférences">
\ No newline at end of file
diff --git a/chrome/locale/fr/strings.properties b/chrome/locale/fr/strings.properties
index 241e89a..041039f 100644
--- a/chrome/locale/fr/strings.properties
+++ b/chrome/locale/fr/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=carte
 mailhops_route_nav_details_label=détails
 mailhops_route_nav_refresh_label=rafraîchir
 mailhops_route_nav_options_label=les options
-mailhops_route_nav_map_tip=Voir la carte
-mailhops_route_nav_details_tip=Afficher Les Détails
-mailhops_route_nav_refresh_tip=Actualiser Cache
-mailhops_route_nav_options_tip=préférences
\ No newline at end of file
diff --git a/chrome/locale/ja/strings.dtd b/chrome/locale/ja/strings.dtd
index 6f92d30..a5dc497 100644
--- a/chrome/locale/ja/strings.dtd
+++ b/chrome/locale/ja/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "細部">
 <!ENTITY mailhops_route_nav_refresh_label      "リフレッシュ">
 <!ENTITY mailhops_route_nav_options_label      "オプション">
-
-<!ENTITY mailhops_route_nav_map_tip          "地図を表示します">
-<!ENTITY mailhops_route_nav_details_tip      "詳細を表示">
-<!ENTITY mailhops_route_nav_refresh_tip      "キャッシュのリフレッシュ">
-<!ENTITY mailhops_route_nav_options_tip      "環境設定">
\ No newline at end of file
diff --git a/chrome/locale/ja/strings.properties b/chrome/locale/ja/strings.properties
index afb462a..9b8157c 100644
--- a/chrome/locale/ja/strings.properties
+++ b/chrome/locale/ja/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=マップ
 mailhops_route_nav_details_label=細部
 mailhops_route_nav_refresh_label=リフレッシュ
 mailhops_route_nav_options_label=オプション
-mailhops_route_nav_map_tip=地図を表示します
-mailhops_route_nav_details_tip=詳細を表示
-mailhops_route_nav_refresh_tip=キャッシュのリフレッシュ
-mailhops_route_nav_options_tip=環境設定
\ No newline at end of file
diff --git a/chrome/locale/pt-BR/strings.dtd b/chrome/locale/pt-BR/strings.dtd
index 483a7ad..82571ce 100644
--- a/chrome/locale/pt-BR/strings.dtd
+++ b/chrome/locale/pt-BR/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "detalhes">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
 <!ENTITY mailhops_route_nav_options_label      "opções">
-
-<!ENTITY mailhops_route_nav_map_tip          "Visualizar Mapa">
-<!ENTITY mailhops_route_nav_details_tip      "Mostrar Detalhes">
-<!ENTITY mailhops_route_nav_refresh_tip      "Atualizar cache">
-<!ENTITY mailhops_route_nav_options_tip      "preferências">
\ No newline at end of file
diff --git a/chrome/locale/pt-BR/strings.properties b/chrome/locale/pt-BR/strings.properties
index d627368..c8ca83c 100644
--- a/chrome/locale/pt-BR/strings.properties
+++ b/chrome/locale/pt-BR/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalhes
 mailhops_route_nav_refresh_label=refrescar
 mailhops_route_nav_options_label=opções
-mailhops_route_nav_map_tip=Visualizar Mapa
-mailhops_route_nav_details_tip=Mostrar Detalhes
-mailhops_route_nav_refresh_tip=Atualizar cache
-mailhops_route_nav_options_tip="preferências
\ No newline at end of file
diff --git a/chrome/locale/ru/strings.dtd b/chrome/locale/ru/strings.dtd
index 17a2cad..286518a 100644
--- a/chrome/locale/ru/strings.dtd
+++ b/chrome/locale/ru/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "подробности">
 <!ENTITY mailhops_route_nav_refresh_label      "обновление">
 <!ENTITY mailhops_route_nav_options_label      "опции">
-
-<!ENTITY mailhops_route_nav_map_tip          "Показать на карте">
-<!ENTITY mailhops_route_nav_details_tip      "Показать Детали">
-<!ENTITY mailhops_route_nav_refresh_tip      "Обновить кэш">
-<!ENTITY mailhops_route_nav_options_tip      "предпочтения">
\ No newline at end of file
diff --git a/chrome/locale/ru/strings.properties b/chrome/locale/ru/strings.properties
index 567414f..0a9362e 100644
--- a/chrome/locale/ru/strings.properties
+++ b/chrome/locale/ru/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=карта
 mailhops_route_nav_details_label=подробности
 mailhops_route_nav_refresh_label=обновление
 mailhops_route_nav_options_label=опции
-mailhops_route_nav_map_tip=Показать на карте
-mailhops_route_nav_details_tip=Показать Детали
-mailhops_route_nav_refresh_tip=Обновить кэш
-mailhops_route_nav_options_tip="предпочтения
\ No newline at end of file
diff --git a/chrome/locale/zh-CN/strings.dtd b/chrome/locale/zh-CN/strings.dtd
index 9096698..19a8725 100644
--- a/chrome/locale/zh-CN/strings.dtd
+++ b/chrome/locale/zh-CN/strings.dtd
@@ -7,8 +7,3 @@
 <!ENTITY mailhops_route_nav_details_label      "詳細信息">
 <!ENTITY mailhops_route_nav_refresh_label      "刷新">
 <!ENTITY mailhops_route_nav_options_label      "選項">
-
-<!ENTITY mailhops_route_nav_map_tip          "顯示地圖">
-<!ENTITY mailhops_route_nav_details_tip      "顯示詳細信息">
-<!ENTITY mailhops_route_nav_refresh_tip      "刷新緩存">
-<!ENTITY mailhops_route_nav_options_tip      "首">
\ No newline at end of file
diff --git a/chrome/locale/zh-CN/strings.properties b/chrome/locale/zh-CN/strings.properties
index 2c83f00..59556eb 100644
--- a/chrome/locale/zh-CN/strings.properties
+++ b/chrome/locale/zh-CN/strings.properties
@@ -6,7 +6,3 @@ mailhops_route_nav_map_label=地圖
 mailhops_route_nav_details_label=詳細信息
 mailhops_route_nav_refresh_label=刷新
 mailhops_route_nav_options_label="選項
-mailhops_route_nav_map_tip=顯示地圖
-mailhops_route_nav_details_tip=顯示詳細信息
-mailhops_route_nav_refresh_tip=刷新緩存
-mailhops_route_nav_options_tip="首
\ No newline at end of file
diff --git a/chrome/skin/classic/pb-styles.css b/chrome/skin/classic/pb-styles.css
index c080b14..3b475ad 100644
--- a/chrome/skin/classic/pb-styles.css
+++ b/chrome/skin/classic/pb-styles.css
@@ -112,3 +112,23 @@ tab {
 	padding: 5px;
 	color: #333;
 }
+
+.fa-lock {
+	padding-top: 7px;
+	color: rgba(73,163,127,1);
+}
+
+.fa-unlock-alt {
+	padding-top: 7px;
+	color: rgba(255,0,0,1);
+}
+
+button {
+	height: 35px;
+}
+
+button.navButton  {
+	height: 25px;
+	width: 10px;
+	text-align: center;
+}