diff --git a/files/www/cgi-bin/status b/files/www/cgi-bin/status
index a7bea373..c392b268 100755
--- a/files/www/cgi-bin/status
+++ b/files/www/cgi-bin/status
@@ -271,7 +271,7 @@ if config == "mesh" then
         html.print("<button type=button onClick='window.location=\"scan\"' title='See what wireless networks are nearby'>WiFi Scan</button>")
     end
 end
-html.print("&nbsp;&nbsp")
+html.print("&nbsp;&nbsp;")
 html.print("<button type=button onClick='window.location=\"setup\"' title='Configure this node'>Setup</button>")
 html.print("&nbsp;&nbsp;")
 html.print("<select name=\"css\" size=\"1\" onChange=\"form.submit()\" >")
@@ -286,7 +286,7 @@ if config == "not set" then
     html.print("Go to the setup page and set your node name and password.<br>")
     html.print("Click Save Changes, <u>even if you didn't make any changes</u>, then the node will reboot.</b>")
     html.print("<br><br>")
-    html.print("<div style=\"max-width: 540px\; text-align: left\">")
+    html.print("<div style='max-width:540px; text-align:left'>")
     html.print("<p>This device can be configured to either permit or prohibit known encrypted traffic on its RF link. It is up to the user to decide which is appropriate based on how it will be used and the license under which it will be operated. These rules vary by country, frequency, and intended use. You are encouraged to read and understand these rules before going further.</p>")
     html.print("<p>This device is pre-configured with no restrictions as to the type of data being passed.</p>")
     html.print("<p>Follow these steps if <span style=\"text-decoration: underline\">you wish to prohibit</span>  known encrypted traffic on the RF link. These instructions will disappear, so copy them for your reference:</p>")
@@ -311,9 +311,9 @@ local col2 = {}
 local ip = cursor:get("network", "wifi", "ipaddr")
 local cidr = netmask_to_cidr(cursor:get("network", "wifi", "netmask"))
 if wifi_disabled then
-    col1[#col1 + 1] = "<th align=right><nobr>Primary address</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
+    col1[#col1 + 1] = "<th align=right><nobr>primary address:</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
 else
-    col1[#col1 + 1] = "<th align=right><nobr>Wifi address</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
+    col1[#col1 + 1] = "<th align=right><nobr>mesh RF address:</nobr><br>SSID:<br>channel:<br><nobr>channel width:</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>" .. wifi_ssid .. "<br>" .. wifi_channel .. "<br>" .. wifi_chanbw .. " MHz</td>"
 end
 
 ip = cursor:get("network", "lan", "ipaddr")
@@ -333,7 +333,7 @@ end
 
 if ip:match("^10%.") or not hide_local then
     cidr = netmask_to_cidr(mask)
-    col1[#col1 + 1] = "<th align=right><nobr>LAN address</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
+    col1[#col1 + 1] = "<th align=right><nobr>LAN address:</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
 end
 
 local wan_iface = aredn.hardware.get_iface_name("wan")
@@ -345,15 +345,15 @@ if not hide_local and wan_iface then
     end
     if ip then
         cidr = netmask_to_cidr(mask)
-        col1[#col1 + 1] = "<th align=right><nobr>" .. wprefix .. "WAN address</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
+        col1[#col1 + 1] = "<th align=right><nobr>" .. wprefix .. "WAN address:</nobr></th><td>" .. ip .. " <small>/ " .. cidr .. "</small><br>"
     else
-        col1[#col1 + 1] = "<th align=right><nobr>" .. wprefix .. "WAN address</nobr></th><td>none</small><br>"
+        col1[#col1 + 1] = "<th align=right><nobr>" .. wprefix .. "WAN address:</nobr></th><td>none</small><br>"
     end
 end
 
 ip = get_default_gw()
 if ip:match("^10%.") or not hide_local then
-    col1[#col1 + 1] = "<th align=right><nobr>default gateway</nobr></th><td>" .. ip
+    col1[#col1 + 1] = "<th align=right valign=top><nobr>default gateway:</nobr></th><td>" .. ip
     if ip:match("^10%.") then
         col1[#col1] = col1[#col1] .. "<br><nobr>" ..  mesh_ip_to_hostnames(ip) .. "</nobr>"
     end
@@ -361,29 +361,24 @@ if ip:match("^10%.") or not hide_local then
 end
 
 if browser_ip then
-    col1[#col1 + 1] = "<th align=right><nobr>your address</nobr></th><td>" .. browser_ip .. "<br><nobr>" ..  mesh_ip_to_hostnames(browser_ip) .. "</nobr></td>"
+    col1[#col1 + 1] = "<th align=right><nobr>your address:</nobr></th><td>" .. browser_ip .. "<br><nobr>" ..  mesh_ip_to_hostnames(browser_ip) .. "</nobr></td>"
 end
 
-if not wifi_disabled then
-    col1[#col1 + 1] = "<th align=right><nobr>SSID</nobr></th><td>" .. wifi_ssid .. "</td>"
-    col1[#col1 + 1] = "<th align=right><nobr>Channel</nobr></th><td>" .. wifi_channel .. "</td>"
-    col1[#col1 + 1] = "<th align=right><nobr>Bandwidth</nobr></th><td>" .. wifi_chanbw .. " MHz</td>"
-end
 
 -- right column - system info
 
 if config == "mesh" and not wifi_disabled then
-    col2[#col2 + 1] = "<th align=right valign=middle><nobr>Signal/Noise/Ratio</nobr></th><td valign=middle><nobr>"
+    col2[#col2 + 1] = "<th align=right valign=middle><nobr>signal / noise / ratio:</nobr></th><td valign=middle><nobr>"
     local s, n = get_wifi_signal(wifi_iface)
     if s == "N/A" then
-        col2[#col2] = col2[#col2] .. "N/A"
+        col2[#col2] = col2[#col2] .. "no RF links"
     else
         col2[#col2] = col2[#col2] .. "<big><b>" .. s .. " / " .. n .. " / " .. math.abs(s - n) .. " dB</b></big>"
+        col2[#col2] = col2[#col2] .. "&nbsp;&nbsp;&nbsp;<button type=button onClick='window.location=\"signal?realtime=1\"' title='Display continuous or archived signal strength on a chart'>Charts</button></nobr></td>"
     end
-    col2[#col2] = col2[#col2] .. "&nbsp;&nbsp;&nbsp;<button type=button onClick='window.location=\"signal?realtime=1\"' title='Display continuous or archived signal strength on a chart'>Charts</button></nobr></td>"
 end
 
-col2[#col2 + 1] = "<th align=right><nobr>firmware version</nobr><br><nobr>model</nobr></th><td>" .. read_all("/etc/mesh-release") .. "<br>" .. (aredn.hardware.get_radio() or { name = "unknown" }).name .. "</td>";
+col2[#col2 + 1] = "<th align=right><nobr>firmware version:</nobr><br><nobr>model:</nobr></th><td>" .. read_all("/etc/mesh-release") .. "<br>" .. (aredn.hardware.get_radio() or { name = "unknown" }).name .. "</td>"
 
 local sysinfo = nixio.sysinfo()
 local uptime = string.format("%d:%02d", math.floor(sysinfo.uptime / 3600) % 24, math.floor(sysinfo.uptime / 60) % 60)
@@ -392,7 +387,7 @@ if sysinfo.uptime >= 172800 then
 elseif sysinfo.uptime >= 86400 then
     uptime = "1 day, " .. uptime
 end
-col2[#col2 + 1] = "<th align=right><nobr>system time</nobr><br>uptime</th><td>" .. os.date("%a %b %e %Y") .. "&nbsp;" .. os.date("%T %Z") .. "<br>" .. uptime .. "</td>";
+col2[#col2 + 1] = "<th align=right><nobr>system time:</nobr><br>uptime:</th><td>" .. os.date("%a %b %e %Y") .. "&nbsp;" .. os.date("%T %Z") .. "<br>" .. uptime .. "</td>"
 
 local vfs = nixio.fs.statvfs("/overlay")
 local fspace = vfs.bfree * vfs.bsize / 1024
@@ -414,8 +409,8 @@ else
     rspace = rspace .. " KB"
 end
 
-col2[#col2 + 1] = "<th align=right valign=top><nobr>load average</nobr><br><nobr>available space</nobr></th><td>" .. string.format("%.2f, %.2f, %.2f", sysinfo.loads[1], sysinfo.loads[2], sysinfo.loads[3]) .. "<br><nobr>flash = " .. fspace .. "</nobr><br><nobr>memory = " .. rspace .. "</nobr></td>";
-col2[#col2 + 1] = "<th align=right valign=top>Host Entries</th><td><nobr>Total = " .. host_total .. "</nobr><br><nobr>Nodes = " .. host_nodes .. "<nobr></td>"
+col2[#col2 + 1] = "<th align=right valign=top><nobr>load average:</nobr><br><nobr>available space:</nobr></th><td>" .. string.format("%.2f, %.2f, %.2f", sysinfo.loads[1], sysinfo.loads[2], sysinfo.loads[3]) .. "<br><nobr><em>flash</em> = " .. fspace .. "</nobr><br><nobr><em>memory</em> = " .. rspace .. "</nobr></td>"
+col2[#col2 + 1] = "<th align=right valign=top><nobr>host entries:</nobr></th><td><b>" .. host_nodes .. "</b> nodes / <b>" .. host_total .. "</b> total devices</td>"
 
 -- now print the tables