diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php
index a26bbea38..45d8e66b7 100644
--- a/src/www/firewall_nat_1to1.php
+++ b/src/www/firewall_nat_1to1.php
@@ -332,18 +332,10 @@ $main_buttons = array(
                   </tr>
                   <tr>
                     <td colspan="9">
-                      <p>
-                        <span class="text-danger">
-                          <strong><?=gettext("Note:"); ?><br />
-                          </strong>
-                        </span>
-                        <?=gettext("Depending on the way your WAN connection is setup, you may also need a"); ?>
-                        <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a><br />
-                        <?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, " .
-                          "it will make this system inaccessible on that IP address. i.e. if " .
-                          "you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) " .
-                          "using the WAN IP address will no longer function."); ?>
-                      </p>
+                      <?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, " .
+                        "it will make this system inaccessible on that IP address. i.e. if " .
+                        "you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) " .
+                        "using the WAN IP address will no longer function."); ?>
                     </td>
                   </tr>
                 </tfoot>
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index e51370d57..f878d481c 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -766,10 +766,6 @@ $( document ).ready(function() {
                   </tr>
                   <tr class="hidden-xs hidden-sm">
                     <td colspan="11">
-                      <strong>
-                        <span class="text-danger"><?=gettext("Hint:");?></span>
-                      </strong>
-                      <br />
                       <?php if ("FloatingRules" != $selected_if): ?>
                       <?=gettext("Rules are evaluated on a first-match basis (i.e. " .
                         "the action of the first rule to match a packet will be executed). " .
diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index c280f97cc..fd87a7127 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -166,10 +166,6 @@ $main_buttons = array(
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
-                <?=gettext("Here you can configure bridging of interfaces."); ?>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_gif.php b/src/www/interfaces_gif.php
index 96647c07a..b1410be6e 100644
--- a/src/www/interfaces_gif.php
+++ b/src/www/interfaces_gif.php
@@ -142,25 +142,22 @@ $main_buttons = array(
 <?php
                   $i++;
                   endforeach; ?>
+                    <tr>
+                      <td colspan="4">
+                        <?=sprintf(
+                          gettext(
+                            'If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker ' .
+                            'on a WAN with a dynamic IP, you may want to add a %sHE.net Tunnelbroker dynamic DNS entry%s ' .
+                            'to keep your tunnel functional when your IP changes.'
+                          ),
+                          '<a href="services_dyndns.php">',
+                          '</a>'
+                        ); ?>
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
-                  <?=gettext("GIF tunnels are configured here."); ?>
-                  <br /><br />
-                  <?=sprintf(
-                      gettext(
-                        'If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker ' .
-                        'on a WAN with a dynamic IP, you may want to add a %sHE.net Tunnelbroker dynamic DNS entry%s ' .
-                        'to keep your tunnel functional when your IP changes.'
-                      ),
-                      '<a href="services_dyndns.php">',
-                      '</a>'
-                    ); ?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index d7e98f813..cecbf2749 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -147,12 +147,6 @@ $main_buttons = array(
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?>
-                </p>
-              </div>
             </form>
           </div>
           </section>
diff --git a/src/www/interfaces_groups.php b/src/www/interfaces_groups.php
index d97cf3b7c..aab44da18 100644
--- a/src/www/interfaces_groups.php
+++ b/src/www/interfaces_groups.php
@@ -142,14 +142,13 @@ $main_buttons = array(
 <?php
                 $i++;
                 endforeach; ?>
+                  <tr>
+                    <td colspan="4">
+                      <?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?>
+                    </td>
+                  </tr>
                 </tbody>
               </table>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index 51d978d89..45a959bc3 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -152,15 +152,14 @@ $main_buttons = array(
 <?php
                     $i++;
                     endforeach; ?>
+                      <tr>
+                        <td colspan="4">
+                           <?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG."); ?>
+                        </td>
+                      </tr>
                     </tbody>
                   </table>
                 </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
-                  <?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG."); ?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_qinq.php b/src/www/interfaces_qinq.php
index b7b0f0c45..6b2d2a5f7 100644
--- a/src/www/interfaces_qinq.php
+++ b/src/www/interfaces_qinq.php
@@ -161,15 +161,14 @@ $main_buttons = array(
 <?php
                     $i++;
                     endforeach; ?>
+                    <tr>
+                      <td colspan="4">
+                        <?= gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems.");?>
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?= gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems.");?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
index 4bfcba083..4766543b5 100644
--- a/src/www/interfaces_vlan.php
+++ b/src/www/interfaces_vlan.php
@@ -144,15 +144,14 @@ $main_buttons = array(
 <?php
                   $i++;
                   endforeach; ?>
+                    <tr>
+                      <td colspan="4">
+                        <?= gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems.");?>
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?= gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems.");?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 0541326e7..d9068621b 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -141,15 +141,14 @@ $main_buttons = array(
 <?php
                     $i++;
                   endforeach;?>
+                    <tr>
+                      <td colspan="4">
+                        <?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?>
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </div>
-              <div class="container-fluid">
-                <p>
-                  <span class="text-danger"><strong><?=gettext("Note");?>:<br /></strong></span>
-                  <?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?>
-                </p>
-              </div>
             </form>
           </div>
         </section>
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index 07d5050de..ff9e9c6ff 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -367,27 +367,28 @@ $( document ).ready(function() {
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="2">
+                  <td></td>
+                  <td>
                     <input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="2">
+                    <?= sprintf(gettext("If the DNS forwarder is enabled, the DHCP".
+                    " service (if enabled) will automatically serve the LAN IP".
+                    " address as a DNS server to DHCP clients so they will use".
+                    " the forwarder. The DNS forwarder will use the DNS servers".
+                    " entered in %sSystem: General setup%s".
+                    " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
+                    " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
+                    " is checked. If you don't use that option (or if you use".
+                    " a static IP address on WAN), you must manually specify at".
+                    " least one DNS server on the %sSystem: General setup%s page."),
+                    '<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?>
+                  </td>
+                </tr>
               </table>
             </div>
-            <div class="container-fluid">
-              <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br />
-              </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
-              " service (if enabled) will automatically serve the LAN IP".
-              " address as a DNS server to DHCP clients so they will use".
-              " the forwarder. The DNS forwarder will use the DNS servers".
-              " entered in %sSystem: General setup%s".
-              " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
-              " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-              " is checked. If you don't use that option (or if you use".
-              " a static IP address on WAN), you must manually specify at".
-              " least one DNS server on the %sSystem: General setup%s page."),
-              '<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?><br />
-              </span></p>
-            </div>
           </form>
         </div>
       </section>
diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php
index 4a28fcd00..f85b85bdb 100644
--- a/src/www/services_dyndns.php
+++ b/src/www/services_dyndns.php
@@ -178,16 +178,12 @@ $main_buttons = array(
 <?php
                       $i++;
                     endforeach; ?>
-                  </tbody>
-                  <tfoot>
                     <tr>
                       <td colspan="6" class="list">
-                        <p><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                        <?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?><br />
-                        <?=gettext("You can force an update for an IP address on the edit page for that service.");?></p>
+                        <?=gettext("You can force an update for an IP address on the edit page for that service.");?>
                       </td>
                     </tr>
-                  </tfoot>
+                  </tbody>
                 </table>
               </div>
             </form>
diff --git a/src/www/services_igmpproxy.php b/src/www/services_igmpproxy.php
index 214791b54..bd05c4b20 100644
--- a/src/www/services_igmpproxy.php
+++ b/src/www/services_igmpproxy.php
@@ -138,11 +138,8 @@ $main_buttons = array(
                     $i++;
                   endforeach; ?>
                     <tr>
-                      <td class="tabcont" colspan="5">
-                       <p>
-                         <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
+                      <td colspan="5">
                          <?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?>
-                       </p>
                       </td>
                     </tr>
                   </tbody>
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 5b8ad963b..f2289417d 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -263,25 +263,26 @@ function show_advanced_dns() {
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="2">
+                        <td></td>
+                        <td>
                           <input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
                         </td>
                       </tr>
+                      <tr>
+                        <td colspan="2">
+                          <?= sprintf(gettext("If the DNS Resolver is enabled, the DHCP".
+                          " service (if enabled) will automatically serve the LAN IP".
+                          " address as a DNS server to DHCP clients so they will use".
+                          " the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers".
+                          " entered in %sSystem: General setup%s".
+                          " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
+                          " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
+                          " is checked."),'<a href="system_general.php">','</a>');?>
+                        </td>
+                      </tr>
                     </tbody>
                   </table>
                 </div>
-                <div class="container-fluid">
-                  <span class="text-danger"><strong><?=gettext("Note:");?><br />
-                  </strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP".
-                  " service (if enabled) will automatically serve the LAN IP".
-                  " address as a DNS server to DHCP clients so they will use".
-                  " the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers".
-                  " entered in %sSystem: General setup%s".
-                  " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
-                  " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-                  " is checked."),'<a href="system_general.php">','</a>');?>
-                  <br /><br />
-                </div>
               </div>
           </section>
          </form>