diff --git a/._chrome.manifest b/._chrome.manifest
new file mode 100644
index 0000000..5b4b4a0
Binary files /dev/null and b/._chrome.manifest differ
diff --git a/chrome.manifest b/chrome.manifest
index 3f91d69..451a7b8 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,3 +1,3 @@
 content  mailhops  jar:chrome/mailhops.jar!/content/
 skin  mailhops  classic/1.0  jar:chrome/mailhops.jar!/skin/classic/
-overlay  chrome://messenger/content/msgHdrViewOverlay.xul  chrome://mailhops/content/mailWindowOverlay.xul
+overlay  chrome://messenger/content/msgHdrViewOverlay.xul  chrome://mailhops/content/msgHdrViewOverlay.xul
diff --git a/chrome/content/._mailhops.js b/chrome/content/._mailhops.js
new file mode 100644
index 0000000..5b4b4a0
Binary files /dev/null and b/chrome/content/._mailhops.js differ
diff --git a/chrome/content/._msgHdrViewOverlay.xul b/chrome/content/._msgHdrViewOverlay.xul
new file mode 100644
index 0000000..a322a67
Binary files /dev/null and b/chrome/content/._msgHdrViewOverlay.xul differ
diff --git a/chrome/content/mailWindowOverlay.xul b/chrome/content/mailWindowOverlay.xul
deleted file mode 100644
index 4867441..0000000
--- a/chrome/content/mailWindowOverlay.xul
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<?xml-stylesheet href="chrome://mailhops/skin/mailhops.css" type="text/css"?>
-
-<overlay id="mailrouteOverlay" 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
-
-	<rows id="expandedHeader2Rows">
-		<row id="mailhops" collapsed="false">
-			<label id="mailhopsLabel" value="route " class="headerName"/>
-               		<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>
-		</row>
-	</rows>
-
-</overlay>
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 7e4748b..06839ed 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,6 +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 mailHops =
 {
@@ -19,13 +20,13 @@ var mailHops =
   isLoaded:     false,
   map:			'goog',
   unit:			'mi',
-  appVersion:	'MailHops Postbox 0.4.3'
+  appVersion:	'MailHops '+gAppName+' 0.4.3'
 }
 
 mailHops.startLoading = function()
 {
   mailHops.isLoaded = true;
-  mailHops.container = document.getElementById ( "mailhops" ) ;
+  mailHops.container = document.getElementById ( "mailhopsBox" ) ;
   mailHops.resultBox = document.getElementById ( "mailhopsResult" ) ;
   mailHops.resultImage = document.getElementById ( "mailhopsResultImage" ) ;  
   mailHops.resultText = document.getElementById ( "mailhopsResultText" ) ;
diff --git a/chrome/content/msgHdrViewOverlay.xul b/chrome/content/msgHdrViewOverlay.xul
new file mode 100644
index 0000000..54f8a18
--- /dev/null
+++ b/chrome/content/msgHdrViewOverlay.xul
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<?xml-stylesheet href="chrome://mailhops/skin/mailhops.css" type="text/css"?>
+
+<overlay id="mailrouteOverlay" 
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml">
+
+	<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>
+	    	</hbox>
+    	</hbox>
+  	</vbox>
+
+</overlay>
diff --git a/mailhops-0.4.2.xpi b/mailhops-0.4.2.xpi
new file mode 100644
index 0000000..ee5a61a
Binary files /dev/null and b/mailhops-0.4.2.xpi differ
diff --git a/mailhops-pb-0.4.3.xpi b/mailhops-pb-0.4.3.xpi
new file mode 100644
index 0000000..b6dc050
Binary files /dev/null and b/mailhops-pb-0.4.3.xpi differ