diff --git a/._chrome.manifest b/._chrome.manifest
deleted file mode 100644
index 5b4b4a0..0000000
Binary files a/._chrome.manifest and /dev/null differ
diff --git a/chrome/content/._mailhops.js b/chrome/content/._mailhops.js
deleted file mode 100644
index 5b4b4a0..0000000
Binary files a/chrome/content/._mailhops.js and /dev/null differ
diff --git a/chrome/content/._msgHdrViewOverlay.xul b/chrome/content/._msgHdrViewOverlay.xul
deleted file mode 100644
index a322a67..0000000
Binary files a/chrome/content/._msgHdrViewOverlay.xul and /dev/null differ
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 06839ed..13b0b75 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,7 +9,7 @@ var gNativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(C
 //IP regex
 var gIPRegEx=/(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}$/; 
 var gAllIPRegEx = /(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}/g;
-var gAppName = window.navigator.appName!=null?window.navigator.appName:'';
+var gApp = 'Postbox';
 
 var mailHops =
 {
@@ -20,7 +20,7 @@ var mailHops =
   isLoaded:     false,
   map:			'goog',
   unit:			'mi',
-  appVersion:	'MailHops '+gAppName+' 0.4.3'
+  appVersion:	'MailHops '+gApp+' 0.4.3'
 }
 
 mailHops.startLoading = function()
diff --git a/chrome/content/msgHdrViewOverlay.xul b/chrome/content/msgHdrViewOverlay.xul
index 54f8a18..092aba9 100644
--- a/chrome/content/msgHdrViewOverlay.xul
+++ b/chrome/content/msgHdrViewOverlay.xul
@@ -8,14 +8,16 @@
 
 	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
 
-	<vbox id="expandedHeaders">
-    	<hbox id="mailhopsBox" class="mailheader" collapsed="false" flex="1">
-    		<label id="mailhopsLabel" class="headerName" value="route: "/>
-	    	<hbox id="mailhopsResult" flex="2">
-		    	<image id="mailhopsResultImage" tooltiptext="Click to view the travel map of this message." width="16" height="11"/>
-            	<hbox id="mailhopsResultText"></hbox>
+	<vbox id="headers">
+    	<hbox id="mailhopsBox" class="mailheader" collapsed="false" inminmode="true">
+    		<label id="mailhopsLabel" class="headerName plain" value="route: "/>
+    		<hbox flex="1">
+	    		<mailheadervalue id="mailhopsResult" flex="1">
+		    		<image id="mailhopsResultImage" tooltiptext="Click to view the travel map of this message." width="16px" height="11px"/>
+            		<hbox id="mailhopsResultText" class="headerValue plain"></hbox>
+	    		</mailheadervalue>
 	    	</hbox>
-    	</hbox>
+    	</hbox>    	
   	</vbox>
 
 </overlay>
diff --git a/chrome/skin/classic/mailhops.css b/chrome/skin/classic/mailhops.css
index 68d568b..c7c821d 100644
--- a/chrome/skin/classic/mailhops.css
+++ b/chrome/skin/classic/mailhops.css
@@ -1,6 +1,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#mailhops {cursor:pointer;}
+#mailhopsBox {cursor:pointer;}
 
 #mailhopsResultText {padding-left:4px;}
 
diff --git a/install.rdf b/install.rdf
index c5939c4..f6c9f1f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -20,12 +20,6 @@
 		<em:optionsURL>chrome://mailhops/content/preferences.xul</em:optionsURL>
 
 		<em:targetApplication>
-		<!-- Thunderbird -->
-		<Description>
-			<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-			<em:minVersion>3.0</em:minVersion>
-			<em:maxVersion>3.1</em:maxVersion>
-		</Description>
 		
  	  	<!-- Postbox -->
 	  	<Description>
diff --git a/mailhops-pb-0.4.3.xpi b/mailhops-pb-0.4.3.xpi
index b6dc050..5a5b86b 100644
Binary files a/mailhops-pb-0.4.3.xpi and b/mailhops-pb-0.4.3.xpi differ