diff --git a/settings-system.lp b/settings-system.lp
index 47dc0662..1e6eb27f 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -84,83 +84,57 @@ mg.include('scripts/lua/settings_header.lp','r')
                         <table class="table table-striped table-bordered nowrap">
                             <tbody>
                                 <tr title="Client broadcast to locate available servers">
-                                    <th scope="row">
-                                        <span>DHCPDISCOVER:</span>
-                                    </th>
+                                    <th scope="row">DHCPDISCOVER:</th>
                                     <td id="sysinfo-dhcp-discover">&nbsp;</td>
                                 </tr>
                                 <tr title="Server to client in response to DHCPDISCOVER with offer of configuration parameters">
-                                    <th scope="row">
-                                        <span>DHCPOFFER:</span>
-                                    </th>
+                                    <th scope="row">DHCPOFFER:</th>
                                     <td id="sysinfo-dhcp-offer">&nbsp;</td>
                                 </tr>
                                 <tr title="Client message to servers either &#010;  (a) requesting offered parameters from one server and implicitly declining offers from all others, &#010;  (b) confirming correctness of previously allocated address after, e.g., system reboot, or &#010;  (c) extending the lease on a particular network address">
-                                    <th scope="row">
-                                        <span>DHCPREQUEST:</span>
-                                    </th>
+                                    <th scope="row">DHCPREQUEST:</th>
                                     <td id="sysinfo-dhcp-request">&nbsp;</td>
                                 </tr>
                                 <tr title="Server to client with configuration parameters, including committed network address">
-                                    <th scope="row">
-                                        <span>DHCPACK:</span>
-                                    </th>
+                                    <th scope="row">DHCPACK:</th>
                                     <td id="sysinfo-dhcp-ack">&nbsp;</td>
                                 </tr>
                                 <tr title="Server to client indicating client's notion of network address is incorrect (e.g., client has moved to new subnet) or client's lease as expired">
-                                    <th scope="row">
-                                        <span>DHCPNAK:</span>
-                                    </th>
+                                    <th scope="row">DHCPNAK:</th>
                                     <td id="sysinfo-dhcp-nak">&nbsp;</td>
                                 </tr>
                                 <tr title="Client to server indicating network address is already in use">
-                                    <th scope="row">
-                                        <span>DHCPDECLINE:</span>
-                                    </th>
+                                    <th scope="row">DHCPDECLINE:</th>
                                     <td id="sysinfo-dhcp-decline">&nbsp;</td>
                                 </tr>
                                 <tr title="Client to server, asking only for local configuration parameters; client already has externally configured network address">
-                                    <th scope="row">
-                                        <span>DHCPINFORM:</span>
-                                    </th>
+                                    <th scope="row">DHCPINFORM:</th>
                                     <td id="sysinfo-dhcp-inform">&nbsp;</td>
                                 </tr>
                                 <tr title="Client to server relinquishing network address and cancelling remaining lease">
-                                    <th scope="row">
-                                        <span>DHCPRELEASE:</span>
-                                    </th>
+                                    <th scope="row">DHCPRELEASE:</th>
                                     <td id="sysinfo-dhcp-release">&nbsp;</td>
                                 </tr>
                                 <tr title="Could not provide an answer, e.g., because there are no leases left, the client wants to renew a lease that is outside of our range, or the explicitly requested address is already in use">
-                                    <th scope="row">
-                                        <span>DHCPNOANSWER:</span>
-                                    </th>
+                                    <th scope="row">DHCPNOANSWER:</th>
                                     <td id="sysinfo-dhcp-noanswer">&nbsp;</td>
                                 </tr>
                                 <tr title="Processed BOOTP packets">
-                                    <th scope="row">
-                                        <span>BOOTP:</span>
-                                    </th>
+                                    <th scope="row">BOOTP:</th>
                                     <td id="sysinfo-dhcp-bootp">&nbsp;</td>
                                 </tr>
                                 <tr title="Processed PXE packets">
-                                    <th scope="row">
-                                        <span>PXE:</span>
-                                    </th>
+                                    <th scope="row">PXE:</th>
                                     <td id="sysinfo-dhcp-pxe">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th scope="row">
-                                        <span>Allocated / pruned IPv4 leases:</span>
-                                    </th>
+                                    <th scope="row">Allocated / pruned IPv4 leases:</th>
                                     <td><span id="sysinfo-dhcp-leases-allocated_4">&nbsp;</span> /
                                         <span id="sysinfo-dhcp-leases-pruned_4">&nbsp;</span>
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th scope="row">
-                                        <span>Allocated / pruned IPv6 leases:</span>
-                                    </th>
+                                    <th scope="row">Allocated / pruned IPv6 leases:</th>
                                     <td><span id="sysinfo-dhcp-leases-allocated_6">&nbsp;</span> /
                                         <span id="sysinfo-dhcp-leases-pruned_6">&nbsp;</span>
                                     </td>
@@ -186,39 +160,27 @@ mg.include('scripts/lua/settings_header.lp','r')
                         <table class="table table-striped table-bordered nowrap">
                             <tbody>
                                 <tr title="Total size of the DNS cache">
-                                    <th scope="row">
-                                        <span>DNS cache size:</span>
-                                    </th>
+                                    <th scope="row">DNS cache size:</th>
                                     <td id="sysinfo-dns-cache-size">&nbsp;</td>
                                 </tr>
                                 <tr title="Share of the allocated cache that is currently in use (this includes stale/expired entries). If the percentage value is very low, it is advisable to reduce the DNS cache size to optimize performance">
-                                    <th scope="row">
-                                        <span>Active cache records:</span>
-                                    </th>
+                                    <th scope="row">Active cache records:</th>
                                     <td id="cache-utilization">&nbsp;</td>
                                 </tr>
                                 <tr title="Number of cache insertions, this number will grow continuously as expiring records naturally make space for new records">
-                                    <th scope="row">
-                                        <span>Total cache insertions:</span>
-                                    </th>
+                                    <th scope="row">Total cache insertions:</th>
                                     <td id="sysinfo-dns-cache-inserted">&nbsp;</td>
                                 </tr>
-                                <tr title="Number of cache entries that had to be removed although they are not expired. When this number if larger than zero, you should consider increasing your total cache size" lookatme-text="DNS cache evictions:">
-                                    <th scope="row">
-                                        <span>DNS cache evictions:</span>
-                                    </th>
+                                <tr title="Number of cache entries that had to be removed although they are not expired. When this number if larger than zero, you should consider increasing your total cache size">
+                                    <th scope="row">DNS cache evictions:</th>
                                     <td id="sysinfo-dns-cache-evicted">&nbsp;</td>
                                 </tr>
                                 <tr title="Number of expired cache entries (they can still be used by the cache optimizer). These entries will only be freed when space is really needed (for efficiency reasons)">
-                                    <th scope="row">
-                                        <span>Expired DNS cache entries:</span>
-                                    </th>
+                                    <th scope="row">Expired DNS cache entries:</th>
                                     <td id="sysinfo-dns-cache-expired">&nbsp;</td>
                                 </tr>
                                 <tr title="Number of immortal cache entries that will never expire (e.g. from /etc/hosts or local configuration)">
-                                    <th scope="row">
-                                        <span>Immortal DNS cache entries:</span>
-                                    </th>
+                                    <th scope="row">Immortal DNS cache entries:</th>
                                     <td id="sysinfo-dns-cache-immortal">&nbsp;</td>
                                 </tr>
                             </tbody>
@@ -253,33 +215,23 @@ mg.include('scripts/lua/settings_header.lp','r')
                         <table class="table table-striped table-bordered nowrap">
                             <tbody>
                                 <tr>
-                                    <th scope="row">
-                                        <span>Local/cache replies:</span>
-                                    </th>
+                                    <th scope="row">Local/cache replies:</th>
                                     <td id="sysinfo-dns-replies-local">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th scope="row">
-                                        Forwarded queries:
-                                    </th>
+                                    <th scope="row">Forwarded queries:</th>
                                     <td id="sysinfo-dns-replies-forwarded">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th scope="row">
-                                        <span>Cache optimizer replies:</span>
-                                    </th>
+                                    <th scope="row">Cache optimizer replies:</th>
                                     <td id="sysinfo-dns-replies-optimized">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th scope="row">
-                                        Unanswered queries:
-                                    </th>
+                                    <th scope="row">Unanswered queries:</th>
                                     <td id="sysinfo-dns-replies-unanswered">&nbsp;</td>
                                 </tr>
                                 <tr class="settings-level-expert">
-                                    <th scope="row">
-                                        <span>Authoritative replies:</span>
-                                    </th>
+                                    <th scope="row">Authoritative replies:</th>
                                     <td id="sysinfo-dns-replies-auth">&nbsp;</td>
                                 </tr>
                             </tbody>
@@ -295,7 +247,7 @@ mg.include('scripts/lua/settings_header.lp','r')
     <div class="col-md-12 settings-level-expert">
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h3 class="box-title">Actions<span id="actions-title"></span></h3>
+                <h3 class="box-title">Actions</h3>
             </div>
             <div class="box-body">
                 <div class="row">