diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0347bbe..1c5e119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,11 @@
 ## 3.0.3 -
 
 ### Added
-- All locale translations for preferences
+- More locale translations for preferences
 
 ### Fixed
 - Messages marked as local due to missing countryCode but had coords
+- Preferences styles
 
 ## 3.0.2 - 2017-01-12
 
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index f86af61..db1c4be 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,7 +9,7 @@ var mailHops =
   msgURI:	null,
   isLoaded: false,
   options: {
-      'version':'MailHops Plugin 3.0.2',
+      'version':'MailHops Plugin 3.0.3',
       'lan':'en',
       'unit':'mi',
       'api_http':'https://',
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 0f3305b..d0c624d 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -90,9 +90,7 @@ var mailHopPreferences = {
     document.getElementById("mailhops-membership-link").addEventListener("click", function () {
       mailHopsUtils.launchExternalURL(this.getAttribute('data-account-url'));
     });
-    document.getElementById("forecastio").addEventListener("click", function () {
-      mailHopsUtils.launchExternalURL('https://darksky.net');
-    });
+    
     this.saveAPIKey();
 
     document.getElementById("mailhop.bar_color").addEventListener("input", function () {
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 41d42a0..6ed4574 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -1,7 +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"?>
+<?xml-stylesheet href="chrome://mailhops/skin/prefs.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % MailHopsDTD SYSTEM "chrome://mailhops/locale/prefs.dtd">
@@ -13,7 +13,7 @@
 	buttons="accept,cancel"
 	onload="mailHopPreferences.loadPreferences();"
 	ondialogaccept="return mailHopPreferences.savePreferences();"
-	title="MailHops Preferences">
+	title="MailHops &mailhops_preferences;">
 
 	<script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
 	<script type="application/x-javascript" src="chrome://mailhops/content/preferences.js"/>
@@ -31,13 +31,13 @@
 	  <tabpanels>
 			<tabpanel>
 				<groupbox flex="1">
-					<caption label="MailHops Membership"/>
+					<caption label="MailHops &mailhops_tab_member_label;"/>
 					<description>
 						API Key <label id="mailhops-membership-link" class="text-link plain" value="Join MailHops" data-account-url="https://mailhops.com"/>
 					</description>
 					<hbox align="center">
 						<textbox id="mailhop.api_key" placeholder="Enter your MailHops API Member Key" width="500"/>
-						<button onclick="mailHopPreferences.saveAPIKey();">Save Key</button>
+						<button onclick="mailHopPreferences.saveAPIKey();">Save API Key</button>
 					</hbox>
 					<hbox align="center">
 						<description>
@@ -74,7 +74,7 @@
 
 			<tabpanel>
 				<groupbox flex="1" style="height:400px;overflow: scroll;">
-					<caption label="Filters"/>
+					<caption label="&mailhops_tab_filters_label;"/>
 							<checkbox id="mailhop.country_tag" label="Tag messages with country origin" checked="false" disabled="true" class="filters"/>
 							<checkbox id="mailhop.travel_time_junk" label="Tag messages that take longer than 10 seconds as Junk" checked="false" disabled="true" class="filters"/>
 
@@ -352,7 +352,7 @@
 
 			<tabpanel>
 	    	<groupbox flex="1">
-				<caption label="Default Language"/>
+				<caption label="&mailhops_tab_defaults_label; Language"/>
 				<radiogroup id="mailhop.lang">
 					<radio value="en" label="English" selected="true"/>
 					<radio value="de" label="German"/>
@@ -367,7 +367,7 @@
 				</groupbox>
 
 			<groupbox flex="1">
-				<caption label="Default Units"/>
+				<caption label="&mailhops_tab_defaults_label; Units"/>
 				<radiogroup id="mailhop.unit">
 					<radio value="mi" label="Miles and ºF" selected="true"/>
 					<radio value="km" label="Kilometers and ºC"/>
@@ -375,7 +375,7 @@
 			</groupbox>
 
 			<groupbox flex="1">
-				<caption label="Default Map"/>
+				<caption label="&mailhops_tab_defaults_label; Map"/>
 				<menulist id="mailhop.map_provider">
 					<menupopup>
 					<menuitem value="OpenStreetMap.Mapnik" label="OpenStreetMap.Mapnik" />
@@ -484,7 +484,7 @@
 	    </tabpanel>
 	    <tabpanel>
 	    	<groupbox flex="1">
-					<caption label="Display Styles"/>
+					<caption label="&mailhops_tab_display_label;"/>
 					<description>
 							Use any <label class="text-link plain" href="https://en.wikipedia.org/wiki/Web_colors" value="HTML color name or Hex code"/>.
 					</description>
@@ -504,7 +504,7 @@
 					    <row>
 								<label value="Bar Color"></label>
 								<textbox id="mailhop.bar_color" value="#5E7A9B" placeholder="Enter a hex color code"/>
-								<grid>
+								<grid class="grid-color">
 								  <columns>
 										<column/>
 										<column/>
@@ -541,7 +541,7 @@
 							<row>
 								<label value="Font Color"></label>
 								<textbox id="mailhop.font_color" value="#FFF" placeholder="Enter a hex color code"/>
-								<grid>
+								<grid class="grid-color">
 								  <columns>
 										<column/>
 										<column/>
@@ -565,19 +565,15 @@
 						</rows>
 					</grid>
 
-					<checkbox id="mailhop.hide_compact" label="Hide MailHops Bar when CompactHeaders" checked="false"/>
+					<checkbox id="mailhop.hide_compact" label="Hide MailHops Bar when CompactHeaders are collapsed" checked="false"/>
+					<label class="text-link plain" href="https://addons.mozilla.org/en-us/thunderbird/addon/compactheader/" value="CompactHeaders Add-on"/>
 
 				</groupbox>
 	    </tabpanel>
 
 	    <tabpanel>
 	    	<groupbox>
-				<caption label="MailHops API &amp; Hosting"/>
-				<!-- <description>
-					MailHops API hosting is sponsored by
-					<image src="https://mailhops.com/images/sponsor.png" width="200"/>
-				</description> -->
-
+				<caption label="&mailhops_tab_api_label;"/>
 				<grid>
 				  <columns>
 						<column/>
@@ -606,7 +602,7 @@
 				<spacer/>
 
 				<description>
-					MailHops API uses <label id="forecastio" class="text-link plain" value="DarkSky"/> to get the weather of the sender, register for an API Key to enable this feature.
+					MailHops API uses <label class="text-link plain" value="DarkSky" href="https://darksky.net"/> to get the weather of the sender, register for an API Key to enable this feature.
 				</description>
 
 				<textbox id="mailhop.fkey" value="" placeholder="Enter your DarkSky API Key"/>
diff --git a/chrome/locale/de/prefs.dtd b/chrome/locale/de/prefs.dtd
index 090df4f..f1ea255 100644
--- a/chrome/locale/de/prefs.dtd
+++ b/chrome/locale/de/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "Einstellungen">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/en/prefs.dtd b/chrome/locale/en/prefs.dtd
index 090df4f..00e7e42 100644
--- a/chrome/locale/en/prefs.dtd
+++ b/chrome/locale/en/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferences">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/es/prefs.dtd b/chrome/locale/es/prefs.dtd
index 090df4f..7a8d1b9 100644
--- a/chrome/locale/es/prefs.dtd
+++ b/chrome/locale/es/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferencias">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/fr/prefs.dtd b/chrome/locale/fr/prefs.dtd
index 090df4f..bd2551c 100644
--- a/chrome/locale/fr/prefs.dtd
+++ b/chrome/locale/fr/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "Préférences">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/ja/prefs.dtd b/chrome/locale/ja/prefs.dtd
index 090df4f..d1feea4 100644
--- a/chrome/locale/ja/prefs.dtd
+++ b/chrome/locale/ja/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "設定">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/pl/prefs.dtd b/chrome/locale/pl/prefs.dtd
index 090df4f..fbdbfac 100644
--- a/chrome/locale/pl/prefs.dtd
+++ b/chrome/locale/pl/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "opcje">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/pt-BR/prefs.dtd b/chrome/locale/pt-BR/prefs.dtd
index 090df4f..289f30e 100644
--- a/chrome/locale/pt-BR/prefs.dtd
+++ b/chrome/locale/pt-BR/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferências">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/ru/prefs.dtd b/chrome/locale/ru/prefs.dtd
index 090df4f..3d72d34 100644
--- a/chrome/locale/ru/prefs.dtd
+++ b/chrome/locale/ru/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "предпочтения">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/locale/zh-CN/prefs.dtd b/chrome/locale/zh-CN/prefs.dtd
index 090df4f..263e744 100644
--- a/chrome/locale/zh-CN/prefs.dtd
+++ b/chrome/locale/zh-CN/prefs.dtd
@@ -1,5 +1,8 @@
+<!ENTITY mailhops_preferences           "优先">
 <!ENTITY mailhops_tab_member_label           "Member">
 <!ENTITY mailhops_tab_filters_label           "Filters">
-<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_defaults_label           "Default">
 <!ENTITY mailhops_tab_display_label           "Display">
 <!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">
diff --git a/chrome/skin/classic/msgNotificationBar.css b/chrome/skin/classic/msgNotificationBar.css
index 4fa7bfd..51d2de2 100644
--- a/chrome/skin/classic/msgNotificationBar.css
+++ b/chrome/skin/classic/msgNotificationBar.css
@@ -37,6 +37,7 @@
   line-height: 24px;
   font-weight: normal;
   background: #5E7A9B;
+	overflow-x: scroll;
 }
 
 #mailhopsNoficationBox #mailhopsDataPanePrefsLink {
diff --git a/chrome/skin/classic/prefs.css b/chrome/skin/classic/prefs.css
new file mode 100644
index 0000000..711513e
--- /dev/null
+++ b/chrome/skin/classic/prefs.css
@@ -0,0 +1,25 @@
+#mailHopsPreferences {
+		font-family: 'Raleway',Arial,sans-serif;
+		font-size: 14px;
+}
+
+#mailHopsPreferences textbox {
+	font-size: 14px;
+	padding: 5px;
+	color: #777;
+}
+
+#mailHopsPreferences tab {
+	font-size: 14px;
+	padding: 5px;
+	color: #333;
+}
+
+#mailHopsPreferences button{
+	height: 35px;
+	color: #333;
+}
+
+#mailHopsPreferences .grid-color{
+  margin-top: 7px;
+}
diff --git a/install.rdf b/install.rdf
index 6cb4af1..b2a2e85 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>3.0.2</em:version>
+		<em:version>3.0.3</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>