diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index f776bbc..50bbda4 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -175,7 +175,7 @@
          
                   <tr>
                      <td colspan=2 ><div class="button"  onclick="clearLive();" title="Clear Live Data from GridTracker">Clear Live</div></td>
-                     <td colspan=2 ><div style="min-width:58px" id="clearOrLoadButton" class="button"  onclick="clearOrLoadQSOs();updateCountStats();" title="Clear or Reload Log Data&10;(does not delete files)">Clear Log</div></td>
+                     <td colspan=2 ><div style="min-width:58px" id="clearOrLoadButton" class="button"  onclick="clearOrLoadQSOs();updateCountStats();" title="Clear or Reload Log Data&#10;(does not delete files)">Clear Log</div></td>
                   </tr>
                </table>
             </div>
@@ -266,7 +266,7 @@
 				<div id="callRosterButton"  class="iconButton" style="padding:0px;" onclick="openCallRosterWindow();" title="Open Call Roster" ><img  src="./img/roster-button.svg" class="buttonImgWide" /></div>
 				<div id="pushPinButton" onclick="togglePushPinMode();" class="iconButton" title="Toggle Push-Pin Mode"><img  id="pinImg" src="" class="buttonImg" /></div>
 				<div id="lookupButton" onclick="openLookupWindow()" class="iconButton" title="Open Lookup Window" ><img style="" src="./img/lookup.svg" class="buttonImg" /></div>		
-				<div id="statsDiv" onclick="showRootInfoBox();" class="iconButton" title="Show Stats"><img src="./img/stats.png" class="buttonImg" /></div> 
+				<div id="statsDiv" onclick="showRootInfoBox();" class="iconButton" title="Show Stats"><img src="./img/stats-button.svg" class="buttonImg" /></div> 
 				<div id="modeModeDiv" onclick="toggleOffline()"  class="iconButton" title="Toggle Online/Offline Mode"><img id="offlineImg" src="" class="buttonImg" /></div>
 				<div id="earthShadow" onclick="toggleEarth()"  class="iconButton" title="Toggle Grayline"><img id="earthImg" src="" class="buttonImg" /></div>
 				<div id="legendToggleDiv" onclick="toggleLegend()" class="iconButton" title="Toggle Map Legend"><img id="legendImg" src="./img/gt_key.png" class="buttonImg" /></div>
@@ -276,11 +276,11 @@
 				<div id="buttonStrikesDiv" onclick="toggleStrikesValue()" class="iconButton" title="Toggle Lightning Strikes" ><img id="strikesImg" src="./img/lw.png"  class="buttonImg"  /></div>
 				<div id="lunaButton" onclick="toggleMoon();" class="iconButton" title="Toggle Moon" ><img id="lunaButonImg" src="./img/luna.png" class="buttonImg" /></div>
 				<div id="gridModeDiv" onclick="toggleGridMode()"  class="iconButton" title="Toggle Maidenhead Width"><img id="modeImg" src="" class="buttonImg" /></div>
-				<div id="settingsButton" onclick="showSettingsBox();" class="iconButton" title="Settings"><img  src="./img/settings_32.png" class="buttonImg" /></div>
+				<div id="settingsButton" onclick="showSettingsBox();" class="iconButton" title="Settings"><img  src="./img/settings-button.svg" class="buttonImg" /></div>
 				<div id="adifLoadDiv" onclick="adifLoadDialog()" class="iconButton" title="Load ADIF Log"><img src="./img/adif.png" class="buttonImg" /></div>
-				<div id="conditionsButton" onclick="showConditionsBox();" class="iconButton" title="View Current Conditions" ><img  src="./img/sun_info.png" class="buttonImg" /></div>
+				<div id="conditionsButton" onclick="showConditionsBox();" class="iconButton" title="View Current Conditions" ><img  src="./img/conditions.svg" class="buttonImg" /></div>
 				<div id="donateButton" onclick="gotoDonate();" class="iconButton" title="Donate with PayPal"><img style="-webkit-filter: invert(1) brightness(50%);" src="./img/heart.png" class="buttonImg" /></div>
-				<div id="alterMuteDiv" onclick="toggleAlertMute()" class="iconButton" title="Toggle Audio Mute" ><img style="-webkit-filter:brightness(80%);" id="alertMuteImg" src="" class="buttonImg" /></div>		
+				<div id="alterMuteDiv" onclick="toggleAlertMute()" class="iconButton" title="Toggle Audio Mute" ><img id="alertMuteImg" src="" class="buttonImg" /></div>		
 				<div id="buttonPSKSpotsBoxDiv" onClick="togglePskSpots();" class="iconButton" title="View PSK-Reporter Reception Reports"><img id="pskSpotsImg" src="./img/psk_spots_off.png" class="buttonImg" /></div>				
 				<div id="buttonPsk24CheckBoxDiv" onclick="grabPsk24()" class="iconButton" title="Your PSK 24hour report"><img  id="pskImg" src="./img/psk_24_32.png" class="buttonImg" /></div>
 				<div id="buttonQRZCheckBoxDiv" onclick="if ( ValidateQrzApi(qrzApiKey ) ) grabQrzComLog()" class="iconButton" title="Download log from QRZ.com" ><img id="qrzLogImg" src="./img/log_QRZ.png"   class="buttonImg"  /></div>
@@ -353,7 +353,6 @@
          <div id="rootSettingsDiv"  style="margin:0;top:1px;display:none;background-color:#00000000;padding:0px;text-align:center;vertical-align:middle;position:relative;z-index:600;" class="roundBorder" >
             <div class="settingstab">
                <button id="generalbut" class="settingsTablinks active" onclick="openSettingsTab(event, 'udpSettingsDiv')">General</button>
-			   <button id="logbut" class="settingsTablinks" onclick="openSettingsTab(event, 'logbookSettingsDiv')">Logbook</button>
 			   <button id="lookupbut" class="settingsTablinks" onclick="openSettingsTab(event, 'lookupsSettingsDiv')">Lookups</button>
                <button class="settingsTablinks" onclick="openSettingsTab(event, 'SpeechSettingsDiv')">Audio</button>
                <button class="settingsTablinks" onclick="openSettingsTab(event, 'mapSettingsDiv')">Map</button>
@@ -361,6 +360,7 @@
                <button class="settingsTablinks" onclick="openSettingsTab(event, 'alertsDiv')">Alerts</button>
 			   <button class="settingsTablinks" onclick="openSettingsTab(event, 'callRosterDiv')">Call Roster</button>
 			   <button class="settingsTablinks" onclick="openSettingsTab(event, 'chatSettingsDiv')">Messaging</button>
+			   <button id="logbut" class="settingsTablinks" onclick="openSettingsTab(event, 'logbookSettingsDiv')">Logbook</button>
 			   <button id="update" class="settingsTablinks" onclick="openSettingsTab(event, 'updateSettingsDiv')">Update</button>
                <button class="settingsTablinks"  style="margin-right:25px;"  onclick="openSettingsTab(event, 'aboutDiv')">About</button>
             </div>
diff --git a/package.nw/gt_chat.html b/package.nw/gt_chat.html
index 610beba..3ea4879 100644
--- a/package.nw/gt_chat.html
+++ b/package.nw/gt_chat.html
@@ -158,24 +158,12 @@ function userAgrees()
 	wrapperDiv.style.display = "block";
 }
 
-function init()
-{
-	lockNewWindows();
+document.addEventListener('keyup', handleKey, false);
 
-	if (window.opener.g_appSettings.gtAgree != "user agrees to messaging")
+function handleKey( event )
+{
+    if (event.key === "Enter") 
 	{
-		noticeDiv.style.display = "block";
-		wrapperDiv.style.display = "none";
-	}
-	else
-	{
-		noticeDiv.style.display = "none";
-		wrapperDiv.style.display = "inline-block";
-		Resize();
-	}
-	showAllCallsigns();
-	messageInput.addEventListener("keyup", function(event) {
-    if (event.key === "Enter") {
         // Do work
 		var msg = messageInput.value.trim();
 		if ( msg.length > 0 && g_currentId != 0 && g_currentId in window.opener.g_gtFlagPins && window.opener.g_gtFlagPins[g_currentId].canmsg == true )
@@ -204,8 +192,25 @@ function init()
 			scrollDown(messageTextDiv);
 		}
 		messageInput.value = "";
-    }
-	});
+    };
+}
+
+function init()
+{
+	lockNewWindows();
+
+	if (window.opener.g_appSettings.gtAgree != "user agrees to messaging")
+	{
+		noticeDiv.style.display = "block";
+		wrapperDiv.style.display = "none";
+	}
+	else
+	{
+		noticeDiv.style.display = "none";
+		wrapperDiv.style.display = "inline-block";
+		Resize();
+	}
+	showAllCallsigns();
 	
 }
 
diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html
index 3445b6f..820de2b 100644
--- a/package.nw/gt_roster.html
+++ b/package.nw/gt_roster.html
@@ -196,7 +196,7 @@
 				<div id="instancesDiv" style="display:none;" ></div>
 			</div>
 
-			<div id="rosterTable" style="overflow:auto;overflow-x:hidden;left:0px;" ></div>
+			<div id="rosterTable" style="overflow:auto;overflow-x:hidden;" ></div>
 		</div>
 		<div id="editView" class="roundBorder"  style="height:100%;border:3px solid #066;padding:10px;margin:10px;display:none;">
 			<div style='display:block;font-size:larger'>Callsign, CQ and DXCC Ignores</div><br/>
diff --git a/package.nw/gt_update.html b/package.nw/gt_update.html
index 55201b6..85ef091 100644
--- a/package.nw/gt_update.html
+++ b/package.nw/gt_update.html
@@ -1,7 +1,11 @@
 <center>
-<img  src="./img/roster-button.svg" width="120px"><br/>
+<img  src="./img/unmuted-button.svg" width="100px"><img  src="./img/settings-button.svg" width="100px"><br/>
 <font size="larger">
-This is the last release until we have documentation ready or there is a bug.<p>
+<p>
+<b>This is a bug fix and look-and-feel update.</b><p> 
+
+Documentation starting with a quick-start guide is being created right now by the document team!<p>
+
 All feature requests will be added to the backlog.<p>
 We will prioritize them in our public #Round-Table room on our Discord server.<p>
 Here is a link to our Discord server. <a href="https://discord.gg/j9Cv9XU" target="_blank" style="font-weight:bold;color:cyan">Link</a><p>
@@ -9,96 +13,37 @@ Here is a link to our Discord server. <a href="https://discord.gg/j9Cv9XU" targe
 <i>We recommend downloading the Discord app instead of using the browser.</i>
 </center>
 <pre>
-GridTracker:
-  I have improved the UI/UX (User interface/User Experience) in this release
-  I have moved buttons around &amp; items are labeled for clarity
-  Most items/buttons that you can interact with have a tooltip
-  Simply hover your mouse-pointer over an item/field/button &amp; it will describe it
-
-Main Window:
-  Update:
-    "Call Roster + Award Tracker" Text button now a 
-      "Call Roster + Award" Icon button
-      
-    "Lookup" Icon button less creepy
-    
-  New:
-    "?" Icon button toggles the Hotkey List
-      In the next release it will open documentation
-      
-    "Timezone" Icon button toggles Timezone layer
-    
-    "Radar" Icon button toggles US Nexrad Weather layer
-
-Hotkey List:
-  Ordered by Key for clarity
-  Added Version to header
+Fixes:
+  QSO Log Event:
+    When a QSO was completed in WSJT-X:
+      The map was not updating with the new QSO data
   
-Map:  
-  Fixed:
-    "Timezone" layer very slow to react 
+  US Nexrad Layer:
+    Always on top regardless of other layers, it's clouds after all
+    
+  Off-Air Message Service:
+    Sometimes not sending a message when "Enter" key pressed
   
-Settings:
-  Update:
-    Merged Spots Tab with Map Tab to make room for Logbook Tab
-      
-  Logbook:
-    New Tab!:
-      "Working Callsign(s)"
-        When enabled, filter your logbooks by callsigns
-          (eg:"N0TTL,N0OAW,KE0PEA") only those callsigns will be loaded
-    
-      "Working Date"
-        When enabled, filter your logbooks by date
-          (Only QSO on or after date will be loaded)
-		  (Dates are 00:00:00 UTC/Zulu)
-      
-      When "Apply Changes" is pressed, GridTracker will re-import logs
-        (it may take a while)
-    
   Lookups:
-    Update:
-      Callsign Database now list instead of boxes
-        Making room for more callsign databases
-          NR0Q found the Canadian call-db and will be in a future release
-          
-      Downloads are now automatic and weekly when enabled
-        The US Database is only 10mb
-        
-    US Callsign Database:
-      Fixed:
-        Corrupt/Incomplete database due to program close while downloading
+    Open lookup window on transmit working properly when enabled
+  
+  Call Roster:
+    Roster mode header now sticky, thank you VE2ESF
 
-Call Roster:
-  Fixed:
-    Hide Controls/Show Controls getting out of sync when switching views
+  Multiple Rig Instances:
+    Lookups:
+      Where active rig in main window was the only one doing lookups
+
+    Call Roster:
+      Band column not going away properly
+    
+Update:
+  A few panel buttons have been updated for quality and clarity of purpose
 
 
 
 
 
-Below is the backlog of features that have been prioritized for the next
-release *after* we get our first update to documentation in over 2 years!
-
-Output from the most recent Round-Table discussion on new features...
-
-Ordered by priority:
-
-DX Logbook, HRD Logbook , N3FJP ACLog, Log4OM..  QSL Import and  Synchronization
-
-Create Award Tracker Stats Tab
-
-Add Settings Window To Call Roster
-
-Add New Ignores in "new settings window" in Call Roster
-
-Add Callsign and DXCC right-click "Add Call/DXCC Watcher" + "Edit Watcher"
-
-Add Lighting alert volume .. and mute override and media selector
-
-Audio Alerts fix up
-
-
 
 
 
diff --git a/package.nw/img/arrow.png b/package.nw/img/arrow.png
deleted file mode 100644
index 821396c..0000000
Binary files a/package.nw/img/arrow.png and /dev/null differ
diff --git a/package.nw/img/c_queue.png b/package.nw/img/c_queue.png
deleted file mode 100644
index 4ea396f..0000000
Binary files a/package.nw/img/c_queue.png and /dev/null differ
diff --git a/package.nw/img/conditions.svg b/package.nw/img/conditions.svg
new file mode 100644
index 0000000..6b4df50
--- /dev/null
+++ b/package.nw/img/conditions.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com">
+  <defs>
+    <filter id="brightness-filter-0" x="-500%" y="-500%" width="1000%" height="1000%" bx:preset="brightness 1 0.9">
+      <feComponentTransfer>
+        <feFuncR type="linear" slope="0.9"/>
+        <feFuncG type="linear" slope="0.9"/>
+        <feFuncB type="linear" slope="0.9"/>
+      </feComponentTransfer>
+    </filter>
+  </defs>
+  <rect style="fill: rgb(255, 175, 51); paint-order: fill; filter: url(#brightness-filter-0);" width="41.258" height="82.655" y="14.682" x="231.021"/>
+  <g transform="matrix(0.913275, 0, 0, 0.914797, 17.852058, 14.681866)" style="filter: url(#brightness-filter-0);">
+    <rect x="84.347" y="61.757" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 258.1618 106.9313)" style="fill: rgb(255, 219, 45); paint-order: fill;" width="45.176" height="90.352"/>
+    <rect y="233.412" style="fill: rgb(255, 219, 45); paint-order: fill;" width="90.353" height="45.176"/>
+    <rect x="84.335" y="359.89" transform="matrix(0.7071 0.7071 -0.7071 0.7071 317.7418 43.0348)" style="fill: rgb(255, 219, 45); paint-order: fill;" width="45.176" height="90.352"/>
+    <rect x="233.412" y="421.647" style="fill: rgb(255, 219, 45); paint-order: fill;" width="45.176" height="90.353"/>
+  </g>
+  <g transform="matrix(0.913275, 0, 0, 0.914797, 17.852058, 14.681866)" style="filter: url(#brightness-filter-0);">
+    <rect x="382.48" y="359.906" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -167.7949 405.0719)" style="fill: rgb(255, 175, 51); paint-order: fill;" width="45.176" height="90.352"/>
+    <rect x="421.647" y="233.412" style="fill: rgb(255, 175, 51); paint-order: fill;" width="90.353" height="45.176"/>
+    <rect x="382.477" y="61.758" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 615.8759 468.9727)" style="fill: rgb(255, 175, 51); paint-order: fill;" width="45.176" height="90.352"/>
+  </g>
+  <circle style="fill: rgb(255, 234, 138); paint-order: fill; filter: url(#brightness-filter-0);" cx="273.852" cy="270.682" r="180.706" transform="matrix(0.913275, 0, 0, 0.914797, 1.548213, 1.250953)"/>
+  <path style="fill: rgb(255, 219, 45); paint-order: fill; filter: url(#brightness-filter-0);" d="M 251.65 83.561 L 251.65 414.179 C 342.796 414.179 416.685 340.168 416.685 248.87 C 416.685 157.572 342.796 83.561 251.65 83.561 Z"/>
+  <polygon style="fill: rgb(255, 175, 51); paint-order: fill; filter: url(#brightness-filter-0);" points="252.039 347.351 252.039 277.868 163.921 277.868 252.039 148.831 252.039 218.314 340.159 218.314"/>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/eye.png b/package.nw/img/eye.png
deleted file mode 100644
index 94a6675..0000000
Binary files a/package.nw/img/eye.png and /dev/null differ
diff --git a/package.nw/img/eye2.png b/package.nw/img/eye2.png
deleted file mode 100644
index 71b8be8..0000000
Binary files a/package.nw/img/eye2.png and /dev/null differ
diff --git a/package.nw/img/grid_both.png b/package.nw/img/grid_both.png
deleted file mode 100644
index 9e38673..0000000
Binary files a/package.nw/img/grid_both.png and /dev/null differ
diff --git a/package.nw/img/grid_live.png b/package.nw/img/grid_live.png
deleted file mode 100644
index 102ab6f..0000000
Binary files a/package.nw/img/grid_live.png and /dev/null differ
diff --git a/package.nw/img/grid_qso.png b/package.nw/img/grid_qso.png
deleted file mode 100644
index 2e59383..0000000
Binary files a/package.nw/img/grid_qso.png and /dev/null differ
diff --git a/package.nw/img/gt_msg.png b/package.nw/img/gt_msg.png
deleted file mode 100644
index d76c1a4..0000000
Binary files a/package.nw/img/gt_msg.png and /dev/null differ
diff --git a/package.nw/img/icon-fullscreen-2x.png b/package.nw/img/icon-fullscreen-2x.png
deleted file mode 100644
index efc0dfb..0000000
Binary files a/package.nw/img/icon-fullscreen-2x.png and /dev/null differ
diff --git a/package.nw/img/icon-fullscreen.png b/package.nw/img/icon-fullscreen.png
deleted file mode 100644
index 8ee2447..0000000
Binary files a/package.nw/img/icon-fullscreen.png and /dev/null differ
diff --git a/package.nw/img/icon_sdr#_off.png b/package.nw/img/icon_sdr#_off.png
deleted file mode 100644
index 5c18a3a..0000000
Binary files a/package.nw/img/icon_sdr#_off.png and /dev/null differ
diff --git a/package.nw/img/icon_sdr#_on.png b/package.nw/img/icon_sdr#_on.png
deleted file mode 100644
index a15ffc4..0000000
Binary files a/package.nw/img/icon_sdr#_on.png and /dev/null differ
diff --git a/package.nw/img/l1.png b/package.nw/img/l1.png
deleted file mode 100644
index d3963ad..0000000
Binary files a/package.nw/img/l1.png and /dev/null differ
diff --git a/package.nw/img/l6.png b/package.nw/img/l6.png
deleted file mode 100644
index 462eb4f..0000000
Binary files a/package.nw/img/l6.png and /dev/null differ
diff --git a/package.nw/img/log_settings.png b/package.nw/img/log_settings.png
deleted file mode 100644
index 425a97e..0000000
Binary files a/package.nw/img/log_settings.png and /dev/null differ
diff --git a/package.nw/img/map3.png b/package.nw/img/map3.png
deleted file mode 100644
index 27ab505..0000000
Binary files a/package.nw/img/map3.png and /dev/null differ
diff --git a/package.nw/img/msg.png b/package.nw/img/msg.png
deleted file mode 100644
index a9d669b..0000000
Binary files a/package.nw/img/msg.png and /dev/null differ
diff --git a/package.nw/img/msg_bell.png b/package.nw/img/msg_bell.png
deleted file mode 100644
index b46793c..0000000
Binary files a/package.nw/img/msg_bell.png and /dev/null differ
diff --git a/package.nw/img/muted-button.svg b/package.nw/img/muted-button.svg
new file mode 100644
index 0000000..da98b4a
--- /dev/null
+++ b/package.nw/img/muted-button.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" preserveAspectRatio="xMidYMid slice" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com">
+  <g transform="matrix(0.9375, 0, 0, 0.9375, 127.552483, -24.709658)">
+    <g style="" transform="matrix(0.917184, 0, 0, 1, 20.99465, -2.828664)">
+      <path style="fill: rgb(20, 79, 155);" d="M -13.868 178.945 L -106.731 178.945 C -115.24 178.945 -122.207 186.424 -122.207 195.644 L -122.207 396.037 C -122.207 405.253 -115.271 412.734 -106.731 412.734 L -13.868 412.734 C -5.327 412.734 1.608 405.253 1.608 396.037 L 1.608 195.644 C 1.608 186.424 -5.358 178.945 -13.868 178.945 Z"/>
+      <path style="fill: rgb(0, 63, 132);" d="M -122.207 295.841 L -122.207 396.038 C -122.207 405.254 -115.271 412.735 -106.731 412.735 L -13.868 412.735 C -5.327 412.735 1.608 405.254 1.608 396.038 L 1.608 295.841 L -122.207 295.841 L -122.207 295.841 Z"/>
+      <path style="fill: rgb(31, 99, 173);" d="M 116.87 80.509 C 111.616 77.676 105.36 78.282 100.662 82.087 L -29.345 178.945 L -29.345 412.737 L 100.662 509.593 C 110.864 517.849 125.425 509.995 125.425 496.233 L 125.425 95.448 C 125.425 89.11 122.123 83.345 116.87 80.509 Z"/>
+      <path style="fill: rgb(0, 73, 153);" d="M -29.345 295.841 L -29.345 412.737 L 100.662 509.593 C 110.864 517.849 125.425 509.995 125.425 496.233 L 125.425 295.841 L -29.345 295.841 Z"/>
+    </g>
+    <path d="M 540.324 254.979 H 585.764 V 345.859 H 676.644 V 391.299 H 585.764 V 482.179 H 540.324 V 391.299 H 449.444 V 345.859 H 540.324 Z" style="stroke-linecap: round; stroke-linejoin: round; stroke-width: 16px; stroke: rgb(226, 0, 0); fill: rgb(110, 0, 0);" transform="matrix(0.707107, 0.707107, -0.707107, 0.707107, 127.898674, -365.551758)" bx:shape="cross 449.444 254.979 227.2 227.2 45.44 45.44 0.5 1@9f543121"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/no_image4.jpg b/package.nw/img/no_image4.jpg
deleted file mode 100644
index f93e428..0000000
Binary files a/package.nw/img/no_image4.jpg and /dev/null differ
diff --git a/package.nw/img/no_image5.jpg b/package.nw/img/no_image5.jpg
deleted file mode 100644
index 8da48a4..0000000
Binary files a/package.nw/img/no_image5.jpg and /dev/null differ
diff --git a/package.nw/img/offline_map.svg b/package.nw/img/offline_map.svg
new file mode 100644
index 0000000..5f36f45
--- /dev/null
+++ b/package.nw/img/offline_map.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="134.5" y1="235.6" x2="134.5" y2="337.3" id="gradient-4" gradientTransform="matrix(0.85484, -0.472679, 2.4894, 3.735858, -713.164935, -795.993822)">
+      <stop offset="0" style="stop-color: rgba(249, 0, 0, 1)"/>
+      <stop offset="1" style="stop-color: rgb(157, 0, 0);"/>
+    </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="400.7" y1="109" x2="400.7" y2="250" id="gradient-6" gradientTransform="matrix(0.854734, 0.472838, -1.778169, 2.667289, 346.76398, -455.266654)">
+      <stop offset="0" style="stop-color: rgba(249, 0, 0, 1)"/>
+      <stop offset="1" style="stop-color: rgb(157, 0, 0);"/>
+    </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="355.05" y1="235.6" x2="355.05" y2="337.4" id="gradient-7" gradientTransform="matrix(0.854448, 0.473265, -2.486954, 3.725862, 781.340909, -1021.527433)">
+      <stop offset="0" style="stop-color: rgba(249, 0, 0, 1)"/>
+      <stop offset="1" style="stop-color: rgb(81, 0, 0);"/>
+    </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="88.9" y1="109" x2="88.9" y2="249.9" id="gradient-1" gradientTransform="matrix(0.85428, -0.473518, 1.814209, 2.715992, -281.979561, -230.501405)">
+      <stop offset="0" style="stop-color: rgba(249, 0, 0, 1)"/>
+      <stop offset="1" style="stop-color: rgb(157, 0, 0);"/>
+    </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="244.8" y1="46.4" x2="244.8" y2="330.4" id="gradient-2" gradientTransform="matrix(-0.999991, 0.003824, -0.005751, -1.247563, 491.498273, 459.702523)">
+      <stop offset="0" style=""/>
+      <stop offset="1" style="stop-color: rgb(255, 0, 0);"/>
+    </linearGradient>
+  </defs>
+  <g transform="matrix(0.953858, 0, 0, 1.047116, 16.588043, -15.254399)" style="">
+    <g>
+      <g>
+        <path d="M179.6,235.6c-33.7,10.3-65.5,28.5-92.2,55.1l46.6,46.6c13.9-13.9,30.1-24.8,47.6-32.5L179.6,235.6z" style="fill: url(#gradient-4);"/>
+        <path d="M175.8,109C111.3,122,49.9,153.4,0,203.3l46.6,46.6c37.5-37.5,83.1-61.9,131.2-73.7L175.8,109z" style="fill: url(#gradient-1);"/>
+        <path d="M313.8,109l-2,67.3c48.1,11.8,93.7,36.2,131.2,73.7l46.6-46.6C439.8,153.4,378.3,122,313.8,109z" style="fill: url(#gradient-6);"/>
+        <path d="M307.9,304.8c17.5,7.7,33.7,18.6,47.7,32.6l46.6-46.6c-26.6-26.6-58.5-44.9-92.2-55.2L307.9,304.8z" style="fill: url(#gradient-7);"/>
+      </g>
+      <circle cx="244.8" cy="403.2" r="40" style="fill: rgb(157, 0, 0);"/>
+      <g>
+        <path d="M260.6,330.4h-31.7c-8.3,0-15.1-6.6-15.3-14.9L206,62.2c-0.3-8.6,6.7-15.8,15.3-15.8h47c8.6,0,15.6,7.1,15.3,15.8 l-7.7,253.3C275.7,323.8,268.9,330.4,260.6,330.4z" style="stroke-width: 1.99903px; fill: url(#gradient-2);"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/offline_map_32.png b/package.nw/img/offline_map_32.png
deleted file mode 100644
index 9f0b389..0000000
Binary files a/package.nw/img/offline_map_32.png and /dev/null differ
diff --git a/package.nw/img/online_map.svg b/package.nw/img/online_map.svg
new file mode 100644
index 0000000..05f3a01
--- /dev/null
+++ b/package.nw/img/online_map.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="249.799" y1="29.7" x2="249.799" y2="490.5" id="gradient-0" gradientTransform="matrix(1, 0, 0, 0.691211, 0.879924, 48.23098)">
+      <stop offset="0" style="stop-color: rgba(76, 255, 0, 1)"/>
+      <stop offset="1" style="stop-color: rgb(24, 81, 0);"/>
+    </linearGradient>
+  </defs>
+  <g style="" transform="matrix(0.885304, 0, 0, 0.837636, 28.462866, 39.920879)">
+    <path d="M 381.512 291.2 C 346.356 251.066 299.583 228.964 249.801 228.964 C 200.019 228.964 153.242 251.066 118.09 291.2 L 71.606 238.44 C 119.165 184.143 182.45 154.238 249.804 154.238 C 317.155 154.238 380.442 184.141 427.999 238.44 L 381.512 291.2 Z M 249.797 104.423 C 328.811 104.423 403.066 139.485 458.884 203.15 L 505.347 150.364 C 437.125 72.554 346.369 29.7 249.797 29.7 C 153.224 29.7 62.472 72.554 -5.749 150.364 L 40.714 203.15 C 96.531 139.485 170.785 104.423 249.797 104.423 Z M 350.666 326.547 C 323.767 295.743 287.945 278.782 249.797 278.782 C 211.655 278.782 175.833 295.745 148.932 326.547 L 195.486 379.231 C 209.972 362.642 229.262 353.506 249.796 353.506 C 270.334 353.506 289.62 362.637 304.104 379.226 L 350.666 326.547 Z M 249.797 390.867 C 225.628 390.867 206.035 413.17 206.035 440.683 C 206.035 468.196 225.628 490.5 249.797 490.5 C 273.964 490.5 293.561 468.196 293.561 440.683 C 293.561 413.17 273.964 390.867 249.797 390.867 Z" style="fill: url(#gradient-0);"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/online_map2_32.png b/package.nw/img/online_map2_32.png
deleted file mode 100644
index 77ea46e..0000000
Binary files a/package.nw/img/online_map2_32.png and /dev/null differ
diff --git a/package.nw/img/online_map3_32.png b/package.nw/img/online_map3_32.png
deleted file mode 100644
index 28afc7e..0000000
Binary files a/package.nw/img/online_map3_32.png and /dev/null differ
diff --git a/package.nw/img/plane.png b/package.nw/img/plane.png
deleted file mode 100644
index ddfb432..0000000
Binary files a/package.nw/img/plane.png and /dev/null differ
diff --git a/package.nw/img/psk_7D_32.png b/package.nw/img/psk_7D_32.png
deleted file mode 100644
index dd06b08..0000000
Binary files a/package.nw/img/psk_7D_32.png and /dev/null differ
diff --git a/package.nw/img/qsl_locked_32.png b/package.nw/img/qsl_locked_32.png
deleted file mode 100644
index eee29d1..0000000
Binary files a/package.nw/img/qsl_locked_32.png and /dev/null differ
diff --git a/package.nw/img/qsl_unlocked_32.png b/package.nw/img/qsl_unlocked_32.png
deleted file mode 100644
index 93ba153..0000000
Binary files a/package.nw/img/qsl_unlocked_32.png and /dev/null differ
diff --git a/package.nw/img/qso_locked_32.png b/package.nw/img/qso_locked_32.png
deleted file mode 100644
index 542a55d..0000000
Binary files a/package.nw/img/qso_locked_32.png and /dev/null differ
diff --git a/package.nw/img/qso_unlocked_32.png b/package.nw/img/qso_unlocked_32.png
deleted file mode 100644
index bfe5827..0000000
Binary files a/package.nw/img/qso_unlocked_32.png and /dev/null differ
diff --git a/package.nw/img/reset_map.png b/package.nw/img/reset_map.png
deleted file mode 100644
index 4117422..0000000
Binary files a/package.nw/img/reset_map.png and /dev/null differ
diff --git a/package.nw/img/settings-button.svg b/package.nw/img/settings-button.svg
new file mode 100644
index 0000000..f7afe1f
--- /dev/null
+++ b/package.nw/img/settings-button.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+  <path style="filter: none; stroke: rgba(131, 131, 131, 0.46); fill: rgb(226, 128, 0); stroke-width: 0px;" d="M 475.477 139.898 C 478.514 125.25 478.33 110.008 474.945 95.354 L 459.861 95.354 C 457.963 88.403 455.217 81.651 451.595 75.27 L 462.121 64.231 C 458.272 58.005 453.698 52.138 448.4 46.721 C 445.421 43.674 442.305 40.86 439.072 38.292 C 436.556 36.299 433.98 34.443 431.328 32.732 L 420.795 43.77 C 417.854 42.033 414.841 40.502 411.768 39.166 C 408.351 37.687 404.85 36.454 401.306 35.467 L 401.116 19.848 C 392.484 17.819 383.641 17.029 374.866 17.471 C 369.227 17.754 363.618 18.55 358.107 19.854 L 358.294 35.467 C 356.341 36.011 354.401 36.633 352.49 37.34 C 347.845 39.034 343.328 41.177 338.994 43.77 L 328.201 32.732 C 322.242 36.645 316.627 41.304 311.467 46.721 C 306.3 52.138 301.867 58.005 298.167 64.231 L 308.96 75.27 C 306.506 79.789 304.494 84.494 302.916 89.325 C 302.263 91.313 301.686 93.33 301.18 95.354 L 286.108 95.354 C 284.917 101.083 284.218 106.896 284.017 112.738 C 283.699 121.832 284.572 130.979 286.64 139.898 L 301.717 139.898 C 303.616 146.842 306.369 153.594 309.984 159.976 L 299.456 171.015 C 303.306 177.241 307.881 183.108 313.179 188.526 C 314.53 189.908 315.911 191.237 317.314 192.524 C 321.417 196.272 325.74 199.6 330.251 202.515 L 333.134 199.493 L 340.777 191.476 C 346.414 194.8 352.329 197.385 358.41 199.235 C 359.031 199.426 359.652 199.607 360.278 199.78 L 360.468 215.404 C 374.654 218.726 389.378 218.726 403.478 215.398 L 403.29 199.78 C 409.978 197.905 416.466 195.14 422.579 191.476 L 433.377 202.515 C 439.338 198.599 444.951 193.942 450.113 188.526 C 455.279 183.108 459.711 177.241 463.411 171.015 L 452.618 159.976 C 456.079 153.594 458.668 146.842 460.394 139.898 L 475.477 139.898 Z M 416.538 154.187 C 404.893 166.4 388.729 171.225 373.402 168.669 C 366.063 167.447 358.917 164.525 352.548 159.91 C 350.227 158.229 348.006 156.319 345.923 154.187 C 343.622 151.835 341.581 149.314 339.809 146.656 C 326.351 126.537 328.023 98.898 345.039 81.058 C 354.483 71.163 366.885 66.111 379.41 65.919 C 385.405 65.829 391.417 66.846 397.149 68.973 C 403.885 71.469 410.217 75.498 415.655 81.058 C 415.82 81.226 415.978 81.387 416.13 81.556 C 435.411 101.784 435.64 134.163 416.538 154.187 Z" transform="matrix(0.965926, 0.258819, -0.258819, 0.965926, 43.418267, -94.547758)"/>
+  <path style="filter: none; fill: rgb(176, 176, 176); stroke: rgba(131, 131, 131, 0.46); stroke-width: 0px; stroke-opacity: 0; stroke-miterlimit: 1;" d="M 182.805 378.364 C 163.701 378.364 145.742 371.22 132.236 358.247 C 118.724 345.273 111.283 328.022 111.283 309.671 C 111.283 291.322 118.724 274.07 132.234 261.097 C 145.742 248.122 163.701 240.977 182.805 240.977 C 201.908 240.977 219.866 248.122 233.374 261.095 C 246.886 274.069 254.327 291.321 254.328 309.671 C 254.327 328.02 246.886 345.272 233.376 358.244 C 219.866 371.22 201.908 378.364 182.805 378.364 Z M 182.805 264.843 C 170.337 264.843 158.616 269.505 149.799 277.975 C 140.984 286.435 136.126 297.691 136.126 309.668 C 136.126 321.643 140.982 332.902 149.799 341.37 C 158.615 349.838 170.337 354.501 182.805 354.501 C 195.272 354.501 206.993 349.838 215.81 341.37 C 224.626 332.902 229.482 321.643 229.482 309.668 C 229.482 297.691 224.625 286.435 215.805 277.97 C 206.993 269.505 195.273 264.843 182.805 264.843 Z" transform="matrix(-0.000001, 1, -1, -0.000001, 492.476203, 126.865326)"/>
+  <path style="filter: none; stroke: rgba(131, 131, 131, 0.46); fill: rgb(0, 228, 57); stroke-width: 0px;" d="M 343.109 347.384 C 348.251 322.584 347.939 296.78 342.208 271.97 L 316.672 271.97 C 313.458 260.203 308.809 248.771 302.678 237.967 L 320.5 219.279 C 313.981 208.739 306.238 198.806 297.269 189.634 C 292.225 184.476 286.952 179.712 281.478 175.364 C 277.218 171.989 272.854 168.847 268.365 165.949 L 250.535 184.638 C 245.556 181.699 240.455 179.104 235.25 176.844 C 229.466 174.34 223.538 172.253 217.537 170.581 L 217.218 144.138 C 202.605 140.704 187.633 139.365 172.775 140.115 C 163.229 140.591 153.732 141.94 144.402 144.149 L 144.721 170.581 C 141.413 171.503 138.128 172.557 134.893 173.753 C 127.03 176.621 119.382 180.249 112.044 184.638 L 93.771 165.949 C 83.683 172.577 74.177 180.463 65.44 189.634 C 56.692 198.806 49.188 208.739 42.924 219.279 L 61.198 237.967 C 57.042 245.62 53.635 253.586 50.964 261.763 C 49.859 265.129 48.882 268.545 48.023 271.97 L 22.508 271.97 C 20.492 281.669 19.309 291.51 18.969 301.402 C 18.429 316.796 19.907 332.283 23.408 347.384 L 48.934 347.384 C 52.149 359.14 56.809 370.572 62.929 381.376 L 45.107 400.065 C 51.625 410.604 59.368 420.537 68.337 429.709 C 70.626 432.051 72.963 434.301 75.339 436.479 C 82.285 442.824 89.605 448.459 97.24 453.395 L 102.122 448.277 L 115.063 434.705 C 124.605 440.331 134.62 444.708 144.915 447.84 C 145.966 448.164 147.018 448.469 148.079 448.764 L 148.398 475.215 C 172.415 480.84 197.342 480.84 221.214 475.205 L 220.895 448.764 C 232.22 445.59 243.203 440.907 253.552 434.705 L 271.834 453.395 C 281.925 446.766 291.43 438.882 300.168 429.709 C 308.915 420.537 316.418 410.604 322.682 400.065 L 304.409 381.376 C 310.268 370.572 314.652 359.14 317.573 347.384 L 343.109 347.384 Z M 243.325 371.575 C 223.61 392.25 196.245 400.419 170.295 396.092 C 157.871 394.024 145.773 389.078 134.991 381.265 C 131.06 378.417 127.302 375.184 123.775 371.575 C 119.88 367.593 116.423 363.326 113.422 358.825 C 90.639 324.762 93.47 277.97 122.28 247.768 C 138.267 231.015 159.264 222.461 180.469 222.138 C 190.618 221.985 200.796 223.707 210.5 227.306 C 221.904 231.533 232.625 238.353 241.832 247.768 C 242.109 248.051 242.376 248.325 242.635 248.61 C 275.277 282.855 275.666 337.675 243.325 371.575 Z"/>
+  <circle style="fill: rgb(216, 216, 216);" cx="380.938" cy="117.768" r="36.242"/>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/settings_32.png b/package.nw/img/settings_32.png
deleted file mode 100644
index 437dd6a..0000000
Binary files a/package.nw/img/settings_32.png and /dev/null differ
diff --git a/package.nw/img/share.png b/package.nw/img/share.png
deleted file mode 100644
index 950b779..0000000
Binary files a/package.nw/img/share.png and /dev/null differ
diff --git a/package.nw/img/solar.png b/package.nw/img/solar.png
deleted file mode 100644
index a481fa0..0000000
Binary files a/package.nw/img/solar.png and /dev/null differ
diff --git a/package.nw/img/stats-button.svg b/package.nw/img/stats-button.svg
new file mode 100644
index 0000000..9df2bad
--- /dev/null
+++ b/package.nw/img/stats-button.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+  <g style="" transform="matrix(0.885304, 0, 0, 0.837636, 28.462866, 39.920879)">
+    <g>
+      <line style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 227, 227); fill: rgb(0, 227, 227); stroke-width: 53.9299px;" x1="443.945" y1="213.831" x2="431.207" y2="110.487"/>
+      <line style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 227, 227); fill: rgb(0, 227, 227); stroke-width: 53.9299px;" x1="376.819" y1="169.25" x2="390.205" y2="65.906" transform="matrix(-0.270065, -1.017635, 0.910999, -0.270065, 379.971717, 539.607005)"/>
+      <line style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 227, 227); fill: rgb(0, 227, 227); stroke-width: 53.9299px;" x1="74.86" y1="412.98" x2="181.188" y2="234.026"/>
+      <line style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 227, 227); fill: rgb(0, 227, 227); stroke-width: 53.9299px;" x1="181.367" y1="232.296" x2="296.17" y2="311.08"/>
+      <line style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 227, 227); fill: rgb(0, 227, 227); stroke-width: 53.9299px;" x1="296.817" y1="310.897" x2="431.068" y2="109.21"/>
+    </g>
+    <g style="" transform="matrix(0.959502, 0, 0, 1, 0.3546, 0)">
+      <line style="stroke-linejoin: round; stroke-linecap: round; stroke: rgb(189, 0, 180); stroke-width: 40.6282px;" x1="8.756" y1="3.226" x2="8.756" y2="503.226"/>
+      <line style="stroke-linejoin: round; stroke-linecap: round; stroke: rgb(189, 0, 180); stroke-width: 40.6282px;" x1="12.742" y1="502.865" x2="508.234" y2="502.865"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/package.nw/img/sun.png b/package.nw/img/sun.png
deleted file mode 100644
index 2be15e6..0000000
Binary files a/package.nw/img/sun.png and /dev/null differ
diff --git a/package.nw/img/sun_bolt.png b/package.nw/img/sun_bolt.png
deleted file mode 100644
index 193186b..0000000
Binary files a/package.nw/img/sun_bolt.png and /dev/null differ
diff --git a/package.nw/img/sun_info.png b/package.nw/img/sun_info.png
deleted file mode 100644
index 2da1db4..0000000
Binary files a/package.nw/img/sun_info.png and /dev/null differ
diff --git a/package.nw/img/trophy_blank.png b/package.nw/img/trophy_blank.png
deleted file mode 100644
index f01111c..0000000
Binary files a/package.nw/img/trophy_blank.png and /dev/null differ
diff --git a/package.nw/img/trophy_cq.png b/package.nw/img/trophy_cq.png
deleted file mode 100644
index 0554c10..0000000
Binary files a/package.nw/img/trophy_cq.png and /dev/null differ
diff --git a/package.nw/img/trophy_itu.png b/package.nw/img/trophy_itu.png
deleted file mode 100644
index d6fe386..0000000
Binary files a/package.nw/img/trophy_itu.png and /dev/null differ
diff --git a/package.nw/img/trophy_wac.png b/package.nw/img/trophy_wac.png
deleted file mode 100644
index 30cc42b..0000000
Binary files a/package.nw/img/trophy_wac.png and /dev/null differ
diff --git a/package.nw/img/trophy_was.png b/package.nw/img/trophy_was.png
deleted file mode 100644
index b6e4c3e..0000000
Binary files a/package.nw/img/trophy_was.png and /dev/null differ
diff --git a/package.nw/img/unmuted-button.svg b/package.nw/img/unmuted-button.svg
new file mode 100644
index 0000000..60f4dfd
--- /dev/null
+++ b/package.nw/img/unmuted-button.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" preserveAspectRatio="xMidYMid slice" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.9375, 0, 0, 0.9375, 127.552483, -24.709658)">
+    <path style="fill: rgb(46, 230, 230);" d="M 262.535 142.331 C 301.747 184.648 321.342 240.104 321.36 295.721 C 321.342 351.431 301.792 406.975 262.534 449.349 C 256.49 455.871 256.49 466.446 262.535 472.968 C 268.58 479.49 278.38 479.49 284.426 472.968 C 329.699 424.117 352.331 359.824 352.313 295.722 C 352.33 231.672 329.631 167.484 284.424 118.717 C 278.38 112.194 268.58 112.195 262.536 118.717 C 256.491 125.239 256.491 135.812 262.537 142.336 L 262.535 142.331 Z"/>
+    <path style="fill: rgb(38, 191, 191);" d="M 321.355 295.841 C 321.31 351.51 301.765 407.005 262.534 449.349 C 256.49 455.871 256.49 466.446 262.536 472.968 C 268.581 479.49 278.381 479.49 284.426 472.968 C 329.67 424.148 352.299 359.904 352.308 295.843 L 321.355 295.843 L 321.355 295.841 Z"/>
+    <path style="fill: rgb(46, 230, 230);" d="M 218.76 189.542 C 245.927 218.878 259.465 257.277 259.481 295.839 C 259.465 334.399 245.924 372.799 218.76 402.135 C 212.715 408.658 212.718 419.232 218.765 425.754 C 224.811 432.276 234.612 432.273 240.656 425.75 C 273.823 389.95 290.454 342.814 290.436 295.841 C 290.453 248.866 273.824 201.73 240.655 165.932 C 234.611 159.409 224.811 159.407 218.765 165.928 C 212.72 172.447 212.718 183.023 218.761 189.547 L 218.76 189.542 Z"/>
+    <path style="fill: rgb(38, 191, 191);" d="M 218.761 402.136 C 212.717 408.659 212.72 419.233 218.765 425.755 C 224.811 432.277 234.613 432.274 240.656 425.751 C 273.823 389.951 290.454 342.815 290.436 295.842 L 259.482 295.842 C 259.465 334.401 245.927 372.799 218.761 402.136 Z"/>
+    <path style="fill: rgb(46, 230, 230);" d="M 175.006 236.803 C 190.078 253.08 197.58 274.36 197.597 295.815 C 197.58 317.285 190.075 338.594 174.974 354.909 C 168.93 361.432 168.935 372.006 174.981 378.528 C 181.027 385.047 190.828 385.043 196.871 378.52 C 217.978 355.738 228.568 325.69 228.551 295.816 C 228.568 265.956 217.981 235.939 196.898 213.192 C 190.854 206.669 181.055 206.667 175.01 213.188 C 168.965 219.71 168.964 230.283 175.007 236.807 L 175.007 236.803 Z"/>
+    <path style="fill: rgb(38, 191, 191);" d="M 197.596 295.841 C 197.571 317.302 190.069 338.603 174.974 354.91 C 168.932 361.433 168.936 372.007 174.981 378.529 C 181.027 385.048 190.829 385.044 196.871 378.521 C 217.973 355.745 228.558 325.707 228.548 295.841 L 197.596 295.841 L 197.596 295.841 Z"/>
+    <g style="" transform="matrix(0.917184, 0, 0, 1, 20.99465, -2.828664)">
+      <path style="fill: rgb(20, 79, 155);" d="M -13.868 178.945 L -106.731 178.945 C -115.24 178.945 -122.207 186.424 -122.207 195.644 L -122.207 396.037 C -122.207 405.253 -115.271 412.734 -106.731 412.734 L -13.868 412.734 C -5.327 412.734 1.608 405.253 1.608 396.037 L 1.608 195.644 C 1.608 186.424 -5.358 178.945 -13.868 178.945 Z"/>
+      <path style="fill: rgb(0, 63, 132);" d="M -122.207 295.841 L -122.207 396.038 C -122.207 405.254 -115.271 412.735 -106.731 412.735 L -13.868 412.735 C -5.327 412.735 1.608 405.254 1.608 396.038 L 1.608 295.841 L -122.207 295.841 L -122.207 295.841 Z"/>
+      <path style="fill: rgb(31, 99, 173);" d="M 116.87 80.509 C 111.616 77.676 105.36 78.282 100.662 82.087 L -29.345 178.945 L -29.345 412.737 L 100.662 509.593 C 110.864 517.849 125.425 509.995 125.425 496.233 L 125.425 95.448 C 125.425 89.11 122.123 83.345 116.87 80.509 Z"/>
+      <path style="fill: rgb(0, 73, 153);" d="M -29.345 295.841 L -29.345 412.737 L 100.662 509.593 C 110.864 517.849 125.425 509.995 125.425 496.233 L 125.425 295.841 L -29.345 295.841 Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js
index ccc63b4..3faa095 100644
--- a/package.nw/lib/adif.js
+++ b/package.nw/lib/adif.js
@@ -1602,9 +1602,7 @@ function oldSendToLogger()
 	sendToLogger(report);
 	
 	
-	if (g_ignoreMessages == 0) {
-		onAdiLoadComplete(report);
-	}
+
 	updateCountStats();
 }
 
@@ -1714,6 +1712,8 @@ function sendToLogger(ADIF)
 	
 	if ( reportHash != lastReportHash )
 	{
+		onAdiLoadComplete(report);
+		
 		// Log worthy
 		if ( logGTqsoCheckBox.checked == true )
 		{
diff --git a/package.nw/lib/alerts.js b/package.nw/lib/alerts.js
index 28d2338..a2f4dc5 100644
--- a/package.nw/lib/alerts.js
+++ b/package.nw/lib/alerts.js
@@ -104,7 +104,21 @@ function loadAlerts()
 	
 	if ( typeof localStorage.savedAlerts == 'undefined' )
 	{
-		g_alerts = Object();
+		g_alerts = {
+			"popup" : {
+				"value": "QRZ",
+				"type": "4",
+				"notify": "2",
+				"repeat": "2",
+				"filename": "",
+				"shortname": "",
+				"lastMessage": "",
+				"lastTime": 0,
+				"fired": 0,
+				"needAck": 0
+			}
+		};
+		
 		g_speechSettings =  Object();
 		g_audioSettings = Object();
 		g_speechSettings.rate = 1;
@@ -530,7 +544,7 @@ function checkAlerts( DEcallsign,  grid,  originalMessage, callsignRecord, band,
 		}
 		else if (  nalert.type == 4 ) // QRZ
 		{
-			if ( originalMessage.indexOf(nalert.value + " ") == 0 )
+			if ( myDEcall.length > 0 && originalMessage.indexOf(myDEcall + " ") == 0 )
 			{
 				handleAlert(nalert, DEcallsign, originalMessage, callsignRecord);
 				hadAlert = true;
@@ -615,7 +629,7 @@ function handleAlert( nAlert, target, lastMessage , callsignRecord, grid)
 		if ( nAlert.notify == 0 )
 			playAlertMediaFile( nAlert.filename );
 		if ( nAlert.notify == 1 )
-			speakQRZString( target, "Calling", nAlert.value );
+			speakQRZString( target, "Calling", myDEcall );
 		if ( nAlert.notify == 2 )
 			displayAlertPopUp( "QRZ", null , null );
 	}
@@ -755,7 +769,7 @@ function unflashAlertPopUp()
 				if ( g_alerts[key].type == 2 )
 					worker += "<td style='color:red'>" + g_alerts[key].value + "</td>";
 				if ( g_alerts[key].type == 4  )
-					worker += "<td style='color:cyan'>" + g_alerts[key].value + "</td>";
+					worker += "<td style='color:cyan'>" + myDEcall + "</td>";
 				if ( g_alerts[key].type == 5 )
 					worker += "<td style='color:lightgreen'>" + g_alerts[key].value + "*</td>";
 				if ( g_alerts[key].type == 6 )
@@ -905,7 +919,7 @@ function displayAlerts()
 			if ( g_alerts[key].type == 2 )
 				worker += "<td style='color:red'>" + g_alerts[key].value + "</td>";
 			if ( g_alerts[key].type == 4 )
-				worker += "<td style='color:cyan'>" + g_alerts[key].value + "</td>";		
+				worker += "<td style='color:cyan'>" + myDEcall + "</td>";		
 			if ( g_alerts[key].type == 5 )
 				worker += "<td style='color:lightgreen'>" + g_alerts[key].value + "*</td>";
 			if ( g_alerts[key].type == 6 )
diff --git a/package.nw/lib/defaults.js b/package.nw/lib/defaults.js
index b678a71..2da9a9c 100644
--- a/package.nw/lib/defaults.js
+++ b/package.nw/lib/defaults.js
@@ -105,7 +105,7 @@ var def_mapSettings =
 	"longitude" :  0.0,
 	"latitude" :  0.0,
 	"loudness" :  1,
-	"mapIndex" :  0,
+	"mapIndex" :  19,
 	"mergeOverlay" :  false,
 	"mouseOver" :  true,
 	"nightLoudness" :  0.8,
diff --git a/package.nw/lib/dp-dark.css b/package.nw/lib/dp-dark.css
index 60257f9..0ae82bc 100644
--- a/package.nw/lib/dp-dark.css
+++ b/package.nw/lib/dp-dark.css
@@ -21,18 +21,25 @@
 
 /* [CONTAINER] */
 .picker {
-  max-width: 300px;
-  border: 1px solid #000;
+  max-width: 200px;
+  border: 1px solid #444;
+  -webkit-border-radius:6px;  
   background: #444;
-  padding: 10px;
+  border-style:outset;
+  padding: 5px;
+}
+
+.picker:hover
+{
+	border: 1px solid #888;
 }
 
 /* [MONTH + YEAR] */
 .picker-m, .picker-y {
-  width: 50%;
+  width: 25%;
   padding: 5px;
   box-sizing: border-box;
-  font-size: 16px;
+  /*font-size: 16px;*/
 }
 
 /* [DAY] */
@@ -40,11 +47,11 @@
   color: #fff;
   border-collapse: separate;
   width: 100%;
-  margin-top: 10px;
+  margin-top: 5px;
 }
 .picker-d table td {
-  width: 14.28%; /* 7 equal columns */
-  padding: 5px;
+  width: 2em; /* 7 equal columns */
+  padding: 2px;
   text-align: center;
 }
 /* Header cells */
diff --git a/package.nw/lib/dp-light.css b/package.nw/lib/dp-light.css
deleted file mode 100644
index edeb632..0000000
--- a/package.nw/lib/dp-light.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/* [POPUP] */
-.picker-wrap {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  background: rgba(0,0,0,0.5);
-  opacity: 0;
-  visibility: hidden;
-  transition: opacity 0.2s;
-}
-.picker-wrap.show {
-  opacity: 1;
-  visibility: visible;
-}
-.picker-wrap .picker{ 
-  margin: 50vh auto 0 auto;
-  transform: translateY(-50%)
-}
-
-/* [CONTAINER] */
-.picker {
-  max-width: 300px;
-  border: 1px solid #eee;
-  background: #fafafa;
-  padding: 10px;
-}
-
-/* [MONTH + YEAR] */
-.picker-m, .picker-y {
-  width: 50%;
-  padding: 5px;
-  box-sizing: border-box;
-  font-size: 16px;
-}
-
-/* [DAY] */
-.picker-d table {
-  color: #333;
-  border-collapse: separate;
-  width: 100%;
-  margin-top: 10px;
-}
-.picker-d table td {
-  width: 14.28%; /* 7 equal columns */
-  padding: 5px;
-  text-align: center;
-}
-/* Header */
-.picker-d-h td {
-  font-weight: bold;
-}
-/* Blank dates */
-.picker-d-b {
-  background: #ddd;
-}
-/* Pickable Dates */
-.picker-d-d:hover {
-  cursor: pointer;
-  background: #2d68c4;
-  color: #fff;
-}
-/* Unpickable Dates */
-.picker-d-dd {
-  color: #aaa;
-  background: #ddd;
-}
\ No newline at end of file
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index ec9d50b..40ce13d 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -1,7 +1,7 @@
 // GridTracker ©2020 N0TTL
 var gtComment1 = "GridTracker is not open source, you may not change, modify or 'borrow' code for your needs that is redistributed in any form without first asking and receiving permission from N0TTL *and* N2VFL";
 var gtComment2 = "Third party libraries and functions used are seperated to third-party.js or their respective lib .js files, the GT close-source directive does not apply to these files of course";
-var gtVersion = 1200826;
+var gtVersion = 1200830;
 var gtBeta = "";
 
 var g_startVersion = 0;
@@ -21,9 +21,6 @@ var vers = String(gtVersion);
 var gtShortVersion = "v" + vers.substr(0,1) + "." + vers.substr(1,2) + "." + vers.substr(3,4) + " " + gtBeta;
 var gtVersionString = "GridTracker ©2020 N0TTL " + gtShortVersion;
 
-document.oncontextmenu = function() {
- return false;
-};
 
 var g_windowName = "GT-main";
 var os = require('os');
@@ -140,7 +137,7 @@ var myBand = 	g_appSettings.myBand;
 var myRawFreq = g_appSettings.myRawFreq;
 var myRawCall = g_appSettings.myRawCall;
 var myRawGrid = g_appSettings.myRawGrid;
-var myDXcall = "";
+
 
 var g_flightDuration = 30;
 
@@ -540,8 +537,8 @@ var g_gtShareFlagImageArray = Array();
 g_gtShareFlagImageArray[1] = "./img/share-on.png";
 g_gtShareFlagImageArray[0] = "./img/share-off.png";
 var g_mapImageArray = Array();
-g_mapImageArray[1] = "./img/online_map3_32.png";
-g_mapImageArray[0] = "./img/offline_map_32.png";
+g_mapImageArray[1] = "./img/online_map.svg";
+g_mapImageArray[0] = "./img/offline_map.svg";
 var g_pinImageArray = Array();
 g_pinImageArray[1] = "./img/red_pin_32.png";
 g_pinImageArray[0] = "./img/gt_grid.png";
@@ -552,8 +549,8 @@ var g_qslLockImageArray = Array();
 g_qslLockImageArray[0] = "./img/qsl_unlocked_32.png";
 g_qslLockImageArray[1] = "./img/qsl_locked_32.png";
 var g_alertImageArray = Array();
-g_alertImageArray[0] = "./img/audio_alerts_32.png";
-g_alertImageArray[1] = "./img/audio_alerts_off_32.png";
+g_alertImageArray[0] = "./img/unmuted-button.svg";
+g_alertImageArray[1] = "./img/muted-button.svg";
 var g_maidenheadModeImageArray = Array();
 g_maidenheadModeImageArray[0] = "./img/mh4_32.png";
 g_maidenheadModeImageArray[1] = "./img/mh6_32.png";
@@ -4299,9 +4296,12 @@ function createGlobalMapLayer(name, maxResolution, minResolution) {
 	g_layerSources[name] = new ol.source.Vector({});
 	if ( typeof maxResolution == "undefined" && typeof minResolution == "undefined" )
 	{
+		var zIndex = Object.keys(g_layerVectors).length + 1;
+		if ( name == "strikes" )
+			zIndex = 2000;
 		g_layerVectors[name] = new ol.layer.Vector({
 			source: g_layerSources[name],
-			zIndex: Object.keys(g_layerVectors).length + 1
+			zIndex: zIndex
 			});
 	}
 	else if ( typeof minResolution == "undefined" )
@@ -4345,7 +4345,7 @@ function createGeoJsonLayer(name, url, color, stroke) {
 			source: layerSource,
 			style: style,
 			visible: true,
-			Index: 1000
+			zIndex: 1
 		
 		});
 	layerVector.set("name", name);
@@ -4575,7 +4575,6 @@ function loadStrikes ()
  
 }
 
-
 function toggleMouseTrack()
 {
 	g_appSettings.mouseTrack ^= 1;
@@ -4583,7 +4582,6 @@ function toggleMouseTrack()
 		mouseTrackDiv.style.display = "none";
 }
 
-
 function myGmapNameCompare(a, b) {
 	return g_maps[a].name.localeCompare(g_maps[b].name);
 }
@@ -4664,10 +4662,11 @@ function initMap() {
 	createGlobalMapLayer("flight");
 	createGlobalMapLayer("transmit");
 	createGlobalMapLayer("gtflags");
-
 	createGlobalMapLayer("temp");
-	createGlobalMapLayer("strikes");
 	createGlobalMapLayer("tz");
+	createGlobalMapLayer("radar");
+	createGlobalMapLayer("strikes");
+
 
 	g_mapView = new ol.View({
 			center: [g_myLon, g_myLat],
@@ -4697,9 +4696,9 @@ function initMap() {
 				g_layerVectors["transmit"],
 				g_layerVectors["gtflags"],
 				g_layerVectors["temp"],
-				g_layerVectors["strikes"],
-				g_layerVectors["tz"]
-				
+				g_layerVectors["tz"],
+				g_layerVectors["radar"],
+				g_layerVectors["strikes"]
 			],
 			controls: g_mapControl,
 			loadTilesWhileInteracting: false,
@@ -4905,42 +4904,28 @@ var g_nexradEnable = 0;
 
 function createNexRad()
 {
-	
-//http://kmi.dpaw.wa.gov.au/geoserver/gwc/service/wms?SERVICE=WMS&
-	
 
-	
-	/*g_Nexrad =  new ol.layer.Tile({
-			source: new ol.source.TileWMS({
-			  url: 'http://kmi.dpaw.wa.gov.au/geoserver/gwc/service/wms',
-			  params: {'LAYERS': 'bom:IDR00006'}
-			})
-		  });*/
-		 
-	/*g_Nexrad =  new ol.layer.Tile({
-			source: new ol.source.TileWMS({
-			  url: 'http://openwms.fmi.fi/geoserver/wms',
-			  params: {'LAYERS': 'Radar:suomi_dbz_eureffin'}
-			})
-		  });*/
-		  
-	/*g_Nexrad = new ol.layer.Image({
-      source: new ol.source.ImageWMS({
-        format: 'image/png',
-        url: 'https://geo.weather.gc.ca/geomet/',
-        params: {'LAYERS': 'RADAR_1KM_RRAI', 'TILED': true},
-      })
-    });*/
-
-	g_Nexrad =  new ol.layer.Tile({
-			source: new ol.source.TileWMS({
+	var layerSource = new ol.source.TileWMS({
 			  url: 'http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0q.cgi',
-			  params: {'LAYERS': 'nexrad-n0q'}
-			})
-		  });
-		  
-	g_map.addLayer(g_Nexrad);
+			  params: {'LAYERS': 'nexrad-n0q'},
+			  transition: 0
+			});
+	
+	var layerVector = new ol.layer.Tile({
+			source: layerSource,
+			visible: true,
+			zIndex: 900
+		
+		});
+		
+	layerVector.set("name", "radar");
+	
+	return layerVector;
+	
 }
+
+	
+
 function toggleNexrad()
 {
 	g_nexradEnable ^= 1;
@@ -4948,11 +4933,14 @@ function toggleNexrad()
 	{
 		if ( g_Nexrad != null )
 		{
+			g_map.removeLayer(g_Nexrad);
 			delete g_Nexrad;
-			g_Nexrad = null;
+			
 		}
-  
-		createNexRad();
+
+
+		g_Nexrad = createNexRad();
+		g_map.addLayer(g_Nexrad);
 
 		if ( g_nexradInterval == null )
 			g_nexradInterval = setInterval(nexradRefresh,600000);
@@ -4984,9 +4972,9 @@ function nexradRefresh()
 	{
 		g_map.removeLayer(g_Nexrad);
 		delete g_Nexrad;
-		g_Nexrad = null;
 		
-		createNexRad();
+
+		g_Nexrad = createNexRad();;
 	}
 }
 
@@ -5421,7 +5409,7 @@ function activeRig( instance )
 }
 
 var g_lastDecodeCallsign = "";
-var g_lastTranmitCallsign = "";
+var g_lastTranmitCallsign = {};
 
 function handleWsjtxStatus(newMessage) {
 	
@@ -5450,7 +5438,25 @@ function handleWsjtxStatus(newMessage) {
 	{
 		rigWrap.style.display= "none";
 	}
+
+	var DXcall = newMessage.DXcall.trim();
 	
+	if ( DXcall.length > 1 )
+	{
+		if ( !(newMessage.instance in g_lastTranmitCallsign ) )
+			g_lastTranmitCallsign[newMessage.instance] = "";
+		
+		if ( lookupOnTx.checked == true && newMessage.Transmitting == 1  )
+		{
+			openLookupWindow(true);
+		}
+		if (  g_lastTranmitCallsign[newMessage.instance]  != DXcall )
+		{
+			lookupCallsign(DXcall, newMessage.DXgrid.trim() );
+			g_lastTranmitCallsign[newMessage.instance]  = DXcall;
+		}
+	}
+
 	if ( g_activeInstance == newMessage.instance )
 	{
 		var sp = newMessage.Id.split(" - ");
@@ -5501,7 +5507,8 @@ function handleWsjtxStatus(newMessage) {
 			" Hz </font><font color='yellow'>(" + myBand + ")</font>";
 		myRawCall = newMessage.DEcall.trim();
 
-		myRawGrid = theDEGrid = newMessage.DEgrid.trim().substr(0, 6);
+		myRawGrid = newMessage.DEgrid.trim().substr(0, 6);
+		
 		var LL = squareToLatLongAll(myRawGrid);
 		g_mapSettings.latitude = g_myLat = LL.la2 - ((LL.la2 - LL.la1) / 2);
 		g_mapSettings.longitude = g_myLon = LL.lo2 - ((LL.lo2 - LL.lo1) / 2);
@@ -5510,8 +5517,6 @@ function handleWsjtxStatus(newMessage) {
 			g_lastRawGrid = myRawGrid;
 		}
 
-	
-		myDXcall = DXcall = newMessage.DXcall.trim();
 
 		dxCallBoxDiv.className = "DXCallBox";
 
@@ -5533,19 +5538,7 @@ function handleWsjtxStatus(newMessage) {
 		}
 		localDXGrid.innerHTML = myDXGrid = newMessage.DXgrid.trim();
 
-		if ( myDXcall.length > 1 )
-		{
-			if ( lookupOnTx.checked == true && newMessage.Transmitting == 1 && g_lastTranmitCallsign != myDXcall )
-			{
-				openLookupWindow(true);
-				g_lastTranmitCallsign = myDXcall;
-			}
-			if (  g_lastDecodeCallsign != myDXcall )
-			{
-				lookupCallsign(DXcall, myDXGrid);
-				g_lastDecodeCallsign = myDXcall;
-			}
-		}
+
 
 		if (myDXGrid.length == 0 && hash in g_liveCallsigns) {
 			localDXGrid.innerHTML = myDXGrid = g_liveCallsigns[hash].grid.substr(0, 4);
@@ -6253,15 +6246,22 @@ function shapeFeature(key, geoJsonData, propname, fillColor, borderColor, border
 	return feature;
 
 }
-function handleWsjtxClear(newMessage) {
-	g_lastMessages = Array();
-	g_lastTraffic = Array();
-	clearGrids();
-	clearCalls();
-	setHomeGridsquare();
+function handleWsjtxClear(newMessage) 
+{
+	for ( var hash in g_liveCallsigns )
+	{
+		if ( g_liveCallsigns[hash].instance == newMessage.instance )
+			delete g_liveCallsigns[hash];
+	}
+	for (var call in g_callRoster) {
+		if ( g_callRoster[call].callObj.instance == newMessage.instance )
+			delete g_callRoster[call];
+	}
+	
+	redrawGrids();
+	redrawPins();
+	
 	updateCountStats();
-	trafficDiv.innerHTML = "";
-	g_callRoster = {};
 	goProcessRoster();
 }
 
@@ -9518,7 +9518,6 @@ function validateNumAndLetter( input )
 
 function validCallsignsKeys( value )
 {
-	console.log(value);
 	if (value == 44)
 		return true;
 	if ( value >= 47 && value <= 57 )
@@ -11583,8 +11582,9 @@ function updateWsjtxListener(port) {
 		g_wsjtUdpSocketError = true;
 	});
 	g_wsjtUdpServer.on('message', function (message, remote) {
-
-		if (udpForwardEnable.checked == true) {
+		if ( g_closing == true ) 
+			true;
+		if (typeof udpForwardEnable != "undefined" && udpForwardEnable.checked == true) {
 			sendForwardUdpMessage(message, message.length, udpForwardPortInput.value, udpForwardIpInput.value);
 		}
 		
diff --git a/package.nw/lib/icon-fullscreen-2x.png b/package.nw/lib/icon-fullscreen-2x.png
deleted file mode 100644
index efc0dfb..0000000
Binary files a/package.nw/lib/icon-fullscreen-2x.png and /dev/null differ
diff --git a/package.nw/lib/icon-fullscreen.png b/package.nw/lib/icon-fullscreen.png
deleted file mode 100644
index 8ee2447..0000000
Binary files a/package.nw/lib/icon-fullscreen.png and /dev/null differ
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index e80f0b2..21ccd7b 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -1273,7 +1273,7 @@ function viewRoster()
 	}
 			
 		
-	var showBands = (window.opener.g_instancesIndex.length > 1?true:false);
+	var showBands = (Object.keys(bands).length > 1?true:false);
 	var showModes = (Object.keys(modes).length > 1?true:false);
 	
 
@@ -1282,18 +1282,18 @@ function viewRoster()
 	
 	if ( g_rosterSettings.compact == false )
 	{
-		worker = "<table id='callTable' class='darkTable' align=left>";
+		worker = "<table id='callTable' class='rosterTable' align=left>";
 		
 
-		worker += "<th style='cursor:pointer;' onclick='showRosterBox(0);' align=left>Callsign</th>";
+		worker += "<thead><th style='cursor:pointer;' onclick='showRosterBox(0);' align=left>Callsign</th>";
 
 		if ( showBands )
 		{
-			worker += "<th style='' onclick='' >Band</th>";
+			worker += "<th onclick='' >Band</th>";
 		}
 		if ( showModes )
 		{
-			worker += "<th style='' onclick='' >Mode</th>";
+			worker += "<th onclick='' >Mode</th>";
 		}
 		
 		worker += "<th style='cursor:pointer;' onclick='showRosterBox(1);'  >Grid</th>";
@@ -1345,7 +1345,7 @@ function viewRoster()
 			worker += "<th title='Off-Air Message User' style='cursor:pointer;' onclick='showRosterBox(14);'>OAM</th>";
 
 		if ( g_rosterSettings.columns.Age )
-			worker += "<th style='cursor:pointer;' onclick='showRosterBox(6);' >Age</th>";
+			worker += "<th style='cursor:pointer;' onclick='showRosterBox(6);' >Age</th></thead>";
 	}
 	else
 	{
@@ -1397,7 +1397,7 @@ function viewRoster()
 
 
 		
-		worker += "<tr id='" + thisCall + newCallList[x].band+newCallList[x].mode + "'>";
+		worker += "<tbody><tr id='" + thisCall + newCallList[x].band+newCallList[x].mode + "'>";
 		worker += "<td name='Callsign' align=left " +newCallList[x].style.callsign + " onClick='initiateQso(\"" +
 			 thisCall + newCallList[x].band+newCallList[x].mode + "\")'>" + thisCall.formatCallsign() + "</td>";
 
@@ -1503,7 +1503,7 @@ function viewRoster()
 		if ( g_rosterSettings.columns.Age )
 			worker += "<td style='color:#EEE' class='timeCol' id='tm"+thisCall+newCallList[x].band+newCallList[x].mode+"'>"+  (timeNowSec() - newCallList[x].age).toDHMS() +"</td>";
 		
-		worker += "</tr>";
+		worker += "</tr></tbody>";
 		}
 		else
 		{
@@ -2105,7 +2105,7 @@ function setVisual()
 			if ( document.getElementById(key) )
 				document.getElementById(key).checked = g_rosterSettings.wanted[key];
 		}
-		
+
 		awardHunterTr.style.display = "none";
 		awardWantedDiv.style.display = "none";
 		huntingTr.style.display = "";
@@ -2120,7 +2120,7 @@ function setVisual()
 		}
 		else
 		{
-			huntingMatrixDiv.style.display = "";
+			huntingMatrixDiv.style.display = "none";
 			huntModeTd.style.display = "block";
 			
 			if (   huntMode.value != "callsign" &&  huntMode.value != "usstate" &&  huntMode.value != "dxccs" )	
diff --git a/package.nw/lib/style_roster.css b/package.nw/lib/style_roster.css
index 0a9c146..914d2f4 100644
--- a/package.nw/lib/style_roster.css
+++ b/package.nw/lib/style_roster.css
@@ -6,6 +6,8 @@ table, th, td {
 	text-align:auto;
 	padding:0px;
 	margin:0px;
+	top:0;
+	
 }
 
 table, th, td, select, .compact {font-size: 12px;}
@@ -18,10 +20,6 @@ th,td {
 }
 
 
-th {
-	font-weight:normal;
-}
-
 
 input[type="checkbox"] 
 {
@@ -149,33 +147,39 @@ table.awardTableCSS thead th:first-child {
 
 
 
-table.darkTable {
+table.rosterTable {
   border-collapse: collapse;
   border: 1px solid #555;
   background-color: black;
   text-align: center;
 }
-table.darkTable td, table.darkTable th {
+
+table.rosterTable td, table.rosterTable th {
   border: 1px solid #555;
   padding:2px 4px;
   
 }
 
-table.darkTable thead {
-  border-bottom: 2px solid #555;
+table.rosterTable thead {
+  border-bottom: 1px solid #555;
 
 }
-table.darkTable thead th {
-  font-weight: bold;
-  text-align: center;
-  border-left: 2px solid #555;
+table.rosterTable thead th {
+	font-weight: bold;
+	text-align: center;
+	border-left:1px solid #555;
+	top:-1px;
+	position:sticky;
+	background-color: #000000FF;
 }
-table.darkTable thead th:first-child {
+
+
+table.rosterTable thead th:first-child {
   border-left: none;
  
 }
 
-.darkTable tr:hover td{  box-shadow: inset 0px 11px 6px -8px #555, inset 0px -11px 6px -8px #555; }
+.rosterTable tr:hover td{  box-shadow: inset 0px 11px 6px -8px #555, inset 0px -11px 6px -8px #555; }
 
 .oneByOne {
 	background-clip:content-box;box-shadow: 0 0 8px 3px inset #FFF;background-color:#000;color:#FF0;
@@ -229,4 +233,8 @@ table.darkTable thead th:first-child {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+
+
+
+.rosterTable tr:hover td{  box-shadow: inset 0px 11px 6px -8px #888, inset 0px -11px 6px -8px #888; }
\ No newline at end of file