diff --git a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
index d648205bb..e69d5ff03 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
@@ -125,5 +125,8 @@ _(Turn off UPS after shutdown)_:
 :apc_killups_help:
 
 <input type="submit" name="#default" value="_(Default)_">
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 32844a089..27168f390 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -659,7 +659,10 @@ _(btrfs scrub status)_:
 <input type="hidden" name="#arg[2]" value="/var/lib/docker">
 <input type="hidden" name="#arg[3]" value="-r">
 &nbsp;
-: <input type="submit" value="_(Scrub)_"><label><input type="checkbox" name="#arg[3]" value=""> _(Correct file system errors)_</label>
+: <span class="inline-block">
+    <input type="submit" value="_(Scrub)_">
+    <label><input type="checkbox" name="#arg[3]" value=""> _(Correct file system errors)_</label>
+  </span>
 
 :docker_scrub_help:
 
@@ -668,7 +671,9 @@ _(btrfs scrub status)_:
 <input type="hidden" name="#arg[1]" value="cancel">
 <input type="hidden" name="#arg[2]" value="/var/lib/docker">
 &nbsp;
-: <input type="submit" value="_(Cancel)_">
+: <span class="inline-block">
+    <input type="submit" value="_(Cancel)_">
+  </span>
 
 :docker_cancel_help:
 
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 0e77a6cb4..5ce273ea4 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1427,8 +1427,11 @@ _(Privileged)_:
 : <a href="javascript:addConfigPopup()"><i class="fa fa-fw fa-plus"></i> _(Add another Path, Port, Variable, Label or Device)_</a>
 
 &nbsp;
-: <input type="submit" value="<?=$xmlType=='edit' ? "_(Apply)_" : " _(Apply)_ "?>"><input type="button" value="_(Done)_" onclick="done()">
-  <?if ($authoringMode):?><button type="submit" name="dryRun" value="true" onclick="$('*[required]').prop('required', null);">_(Save)_</button><?endif;?>
+: <span class="inline-block">
+    <input type="submit" value="<?=$xmlType=='edit' ? "_(Apply)_" : " _(Apply)_ "?>">
+    <input type="button" value="_(Done)_" onclick="done()">
+    <?if ($authoringMode):?><button type="submit" name="dryRun" value="true" onclick="$('*[required]').prop('required', null);">_(Save)_</button><?endif;?>
+  </span>
 
 </form>
 </div>
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index bbafb709e..6839cbd16 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -313,7 +313,10 @@ _(btrfs scrub status)_:
 <input type="hidden" name="#arg[2]" value="/etc/libvirt">
 <input type="hidden" name="#arg[3]" value="-r">
 &nbsp;
-: <input type="submit" value="_(Scrub)_"><label><input type="checkbox" name="#arg[3]" value="">_(Correct file system errors)_</label>
+: <span class="inline-block">
+    <input type="submit" value="_(Scrub)_">
+    <label><input type="checkbox" name="#arg[3]" value="">_(Correct file system errors)_</label>
+  </span>
 
 :vms_scrub_help:
 
@@ -322,7 +325,9 @@ _(btrfs scrub status)_:
 <input type="hidden" name="#arg[1]" value="cancel">
 <input type="hidden" name="#arg[2]" value="/etc/libvirt">
 &nbsp;
-: <input type="submit" value="_(Cancel)_">
+: <span class="inline-block">
+    <input type="submit" value="_(Cancel)_">
+  </span>
 
 :vms_cancel_help:
 
diff --git a/emhttp/plugins/dynamix/Confirmations.page b/emhttp/plugins/dynamix/Confirmations.page
index 06fecd1ab..9135c7d36 100644
--- a/emhttp/plugins/dynamix/Confirmations.page
+++ b/emhttp/plugins/dynamix/Confirmations.page
@@ -44,6 +44,9 @@ _(Confirm sleep command)_:
   </select>
 <?endif;?>
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+  <input type="submit" name="#apply" value="_(Apply)_" disabled>
+  <input type="button" value="_(Done)_" onclick="done()">
+</span>
 
 </form>
diff --git a/emhttp/plugins/dynamix/Console.page b/emhttp/plugins/dynamix/Console.page
index ac8d16699..56785bfa4 100644
--- a/emhttp/plugins/dynamix/Console.page
+++ b/emhttp/plugins/dynamix/Console.page
@@ -114,5 +114,8 @@ _(Persistent Bash History)_:
 :console_bash_help:
 
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+  <input type="submit" name="#apply" value="_(Apply)_" disabled>
+  <input type="button" value="_(Done)_" onclick="done()">
+</span>
 </form>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 955e799c1..021a75726 100644
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -841,7 +841,9 @@ _(Critical disk utilization threshold)_ (%):
 
 <?endif;?>
 &nbsp;
-: <input type="submit" name="changeDisk" value="_(Apply)_" disabled><input type="button" id="doneButton" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeDisk" value="_(Apply)_" disabled>
+    <input type="button" id="doneButton" value="_(Done)_" onclick="done()">
   <?$erasable=false?>
   <?$removeable=false?>
   <?if (diskType('Parity','Data')):?>
@@ -855,6 +857,7 @@ _(Critical disk utilization threshold)_ (%):
     <?if (_var($var,'fsState')=="Stopped"): $removeable=true; endif;?>
     <input type="button" id="removeButton" value="_(Remove Pool)_" onclick="removePool()"<?=$removeable?'':' disabled'?>>
   <?endif;?>
+  </span>
 </form>
 
 <?if (fsType('btrfs')):?>
@@ -929,7 +932,10 @@ _(btrfs balance status)_:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="_(Balance)_" disabled><b>_(Balance)_</b> _(is only available when the filesyestem is mounted)_
+: <span class="inline-block">
+    <input type="submit" value="_(Balance)_" disabled>
+    <span class="inline-block"><b>_(Balance)_</b> _(is only available when the filesyestem is mounted)_</span>
+  </span>
 
 <?endif;?>
 </form>
@@ -1118,7 +1124,10 @@ _(btrfs check status)_:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="_(Check)_" disabled> **_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+: <span class="inline-block">
+    <input type="submit" value="_(Check)_" disabled>
+    <span class="inline-block">**_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+  </span>
 
 <?endif;?>
 </form>
@@ -1245,7 +1254,11 @@ _(reiserfsck status)_:
 <input type="hidden" name="#arg[3]" value="<?=_var($disk,'id')?>">
 
 &nbsp;
-: <input type="submit" value="_(Check)_"><input type="text" name="#arg[4]" class="narrow" maxlength="256" value=""> _(Options (see Help))_
+: <span class="inline-block">
+    <input type="submit" value="_(Check)_">
+    <input type="text" name="#arg[4]" class="narrow" maxlength="256" value="">
+    <span class="inline-block">_(Options (see Help))_</span>
+  </span>
 
 :info_reiserfs_check_help:
 
@@ -1256,7 +1269,10 @@ _(reiserfsck status)_:
 <input type="hidden" name="#arg[3]" value="<?=_var($disk,'id')?>">
 
 &nbsp;
-: <input type="submit" value="_(Cancel)_"> *_(Running)_*
+: <span class="inline-block">
+    <input type="submit" value="_(Cancel)_">
+    <span class="inline-block">*_(Running)_*</span>
+  </span>
 
 :info_reiserfs_cancel_help:
 
@@ -1264,7 +1280,10 @@ _(reiserfsck status)_:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="_(Check)_" disabled> **_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+: <span class="inline-block">
+    <input type="submit" value="_(Check)_" disabled>
+    <span class="inline-block">**_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+  </span>
 
 <?endif;?>
 </form>
@@ -1342,7 +1361,10 @@ _(xfs_repair status)_:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="_(Check)_" disabled> **_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+: <span class="inline-block">
+    <input type="submit" value="_(Check)_" disabled>
+    <span class="inline-block">**_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+  </span>
 
 <?endif;?>
 </form>
@@ -1434,17 +1456,27 @@ _(SMART controller type)_:
 :info_controller_type_help:
 
 _(SMART attribute notifications)_:
-: <input type="text" name="smCustom" value="<?=$disk['smCustom']??$var['smCustom']??''?>" class="narrow">_(Custom attributes (use comma to separate numbers))_
+: <input type="text" name="smCustom" value="<?=$disk['smCustom']??$var['smCustom']??''?>">
+  <span class="input-instructions">_(Custom attributes (use comma to separate numbers))_</span>
 
 <?for ($x=0; $x<count($preselect); $x++):?>
 &nbsp;
-: <input type="checkbox" name="at<?=$x?>" value="<?=_var($preselect[$x],'code')?>"<?=in_array(_var($preselect[$x],'code'),$events)?' checked':''?>><span class="code">_(Attribute)_ = <?=_var($preselect[$x],'code')?></span><?=_var($preselect[$x],'text')?>
+: <span class="inline-block">
+    <label class="inline-block">
+      <input type="checkbox" name="at<?=$x?>" value="<?=_var($preselect[$x],'code')?>"<?=in_array(_var($preselect[$x],'code'),$events)?' checked':''?>>
+      <span class="code">_(Attribute)_ = <?=_var($preselect[$x],'code')?></span>
+    </label>
+    <span class="inline-block"><?=_var($preselect[$x],'text')?></span>
+  </span>
 <?endfor;?>
 
 :info_attribute_notifications_help:
 
 <input type="submit" name="#default" value="_(Default)_">
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 <?endif?>
 
diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page
index eae11268a..d2396458e 100644
--- a/emhttp/plugins/dynamix/DiskSettings.page
+++ b/emhttp/plugins/dynamix/DiskSettings.page
@@ -263,7 +263,10 @@ _(Default critical SSD temperature threshold)_ (&deg;<?=_var($display,'unit','C'
 :ssd_default_critical_temperature_help:
 
 &nbsp;
-: <input type="submit" name="changeDisk" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeDisk" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <?if ($encrypt && $var['fsState']=='Started'):?>
@@ -317,7 +320,10 @@ _(Select new keyfile)_:
 
 </div>
 &nbsp;
-: <input type="submit" name="newkey" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="newkey" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 <?endif;?>
 
@@ -386,5 +392,8 @@ _(Default SMART attribute notifications)_:
 :disk_default_smart_attribute_help:
 
 <input type="submit" name="#default" value="_(Default)_">
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 9786213c9..4c1160203 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -334,5 +334,8 @@ _(Allow realtime updates on inactive browsers)_:
   </select>
 
 <input type="submit" name="#default" value="_(Default)_" onclick="filename='reset'">
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/Eth0.page b/emhttp/plugins/dynamix/Eth0.page
index d95dc64c8..692ee6449 100644
--- a/emhttp/plugins/dynamix/Eth0.page
+++ b/emhttp/plugins/dynamix/Eth0.page
@@ -897,7 +897,10 @@ _(IPv6 privacy extensions)_:
 </div>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" onclick="$('#wait_eth0').show()" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" onclick="$('#wait_eth0').show()" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 <?if (!$service):?>
 <input type="button" id="button-add-eth0" class="hide" value="_(Add VLAN)_" onclick="addVLAN('eth0')">
 <?else:?><span><?=sprintf(_('Stop **%s** to make changes, see'), $service).' (<a href="/Settings">'._('Settings').'</a>)'?></span><?endif;?>
diff --git a/emhttp/plugins/dynamix/EthX.page b/emhttp/plugins/dynamix/EthX.page
index be1713f3b..aa7ac8408 100644
--- a/emhttp/plugins/dynamix/EthX.page
+++ b/emhttp/plugins/dynamix/EthX.page
@@ -342,7 +342,10 @@ _(IPv6 privacy extensions)_:
 </div>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" onclick="$('#wait_<?=$tabbed?'eth0':'ethX'?>').show()" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" onclick="$('#wait_<?=$tabbed?'eth0':'ethX'?>').show()" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 <input type="button" name="#shut_ethX" value="<?=_('Port '.$cmd)?>" onclick="portToggle('ethX','<?=$cmd?>')">
 <?if (!$service):?>
 <input type="button" id="button-add-ethX" class="hide" value="_(Add VLAN)_" onclick="addVLAN('ethX')">
diff --git a/emhttp/plugins/dynamix/FTP.page b/emhttp/plugins/dynamix/FTP.page
index ef50a6a0c..a08fe7b01 100644
--- a/emhttp/plugins/dynamix/FTP.page
+++ b/emhttp/plugins/dynamix/FTP.page
@@ -47,7 +47,10 @@ _(FTP user(s))_:
 :ftp_users_help:
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 
 </form>
 
diff --git a/emhttp/plugins/dynamix/FlashInfo.page b/emhttp/plugins/dynamix/FlashInfo.page
index 6113d787a..da3076466 100644
--- a/emhttp/plugins/dynamix/FlashInfo.page
+++ b/emhttp/plugins/dynamix/FlashInfo.page
@@ -68,4 +68,7 @@ _(Flash GUID)_:
 :flash_backup_help:
 
 &nbsp;
-: <input type="button" value="_(Flash backup)_" onclick="backup()"><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="button" value="_(Flash backup)_" onclick="backup()">
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
diff --git a/emhttp/plugins/dynamix/Grub.page b/emhttp/plugins/dynamix/Grub.page
index 63f48c5da..3afc9d2ae 100644
--- a/emhttp/plugins/dynamix/Grub.page
+++ b/emhttp/plugins/dynamix/Grub.page
@@ -60,7 +60,10 @@ _(Permit UEFI boot mode)_ <input type="checkbox" name="boot" checked disabled>
 : *_(By default UEFI and Legacy boot mode are both enabled when GRUB is used to boot the machine)_.*
 
 <input type="button" value="_(Default)_" onclick="setDefault(this.form)">
-: <input type="submit" value="_(Apply)_"><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_">
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 
 :grub_button_help:
 
diff --git a/emhttp/plugins/dynamix/Identification.page b/emhttp/plugins/dynamix/Identification.page
index 7cdb669f7..f28ed33ab 100644
--- a/emhttp/plugins/dynamix/Identification.page
+++ b/emhttp/plugins/dynamix/Identification.page
@@ -42,7 +42,11 @@ _(Model)_:
 :id_model_help:
 
 &nbsp;
-: <input type="submit" name="changeNames" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($disabled):?>*_(Array must be **Stopped** to change)_*<?endif;?>
+: <span class="inline-block">
+    <input type="submit" name="changeNames" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+  <?if ($disabled):?>*_(Array must be **Stopped** to change)_*<?endif;?>
 </form>
 
 <script>
diff --git a/emhttp/plugins/dynamix/MoverSettings.page b/emhttp/plugins/dynamix/MoverSettings.page
index c32272d23..930940fe3 100644
--- a/emhttp/plugins/dynamix/MoverSettings.page
+++ b/emhttp/plugins/dynamix/MoverSettings.page
@@ -119,7 +119,10 @@ _(Mover logging)_:
 
 <?endif;?>
 &nbsp;
-: <input type="submit" name="changeMover" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeMover" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 <?if ($setup):?>
 <?if ($pool_devices):?>
 <?if (file_exists('/var/run/mover.pid')):?>
diff --git a/emhttp/plugins/dynamix/NFS.page b/emhttp/plugins/dynamix/NFS.page
index 2a5bcff17..3fa840f4d 100644
--- a/emhttp/plugins/dynamix/NFS.page
+++ b/emhttp/plugins/dynamix/NFS.page
@@ -47,7 +47,10 @@ _(Tunable (fuse_remember))_:
 :nfs_tunable_fuse_remember_help:
 
 &nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" name="changeShare" value="_(Apply)_" disabled>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <form markdown="1" name="nfs_settings" method="POST" action="/update.php" target="progressFrame">
@@ -76,7 +79,10 @@ _(Number of Threads)_:
 :nfs_threads_help:
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" value="_(Apply)_" disabled>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <script>
diff --git a/emhttp/plugins/dynamix/NetworkExtra.page b/emhttp/plugins/dynamix/NetworkExtra.page
index 5552c94d4..e2c3b88a8 100644
--- a/emhttp/plugins/dynamix/NetworkExtra.page
+++ b/emhttp/plugins/dynamix/NetworkExtra.page
@@ -81,5 +81,8 @@ _(Exclude listening interfaces)_:
 :eth_network_extra_exclude_help:
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/NetworkRules.page b/emhttp/plugins/dynamix/NetworkRules.page
index 0bd8bcd62..aa5c1b257 100644
--- a/emhttp/plugins/dynamix/NetworkRules.page
+++ b/emhttp/plugins/dynamix/NetworkRules.page
@@ -71,7 +71,10 @@ _(Interface)_ <?=$eth?>:
 <?endforeach;?>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 :eth_network_rules_help:
diff --git a/emhttp/plugins/dynamix/Notifications.page b/emhttp/plugins/dynamix/Notifications.page
index 3760d47f9..a31c737b5 100644
--- a/emhttp/plugins/dynamix/Notifications.page
+++ b/emhttp/plugins/dynamix/Notifications.page
@@ -364,5 +364,8 @@ _(Notification entity)_:
 :notifications_classification_help:
 
 <input type="submit" name="#default" value="_(Default)_">
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/OutgoingProxy.page b/emhttp/plugins/dynamix/OutgoingProxy.page
index 2b26ef2be..e48cb584a 100644
--- a/emhttp/plugins/dynamix/OutgoingProxy.page
+++ b/emhttp/plugins/dynamix/OutgoingProxy.page
@@ -199,7 +199,10 @@ _(Password)_:
 </div>
 
 &nbsp;
-: <input type="submit" value='_(Apply)_'><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" value='_(Apply)_'>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <script>
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index ecd819198..f9876564f 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -56,7 +56,10 @@ _(Error reporting level)_:
 : <input type="checkbox" id="screenlog" onclick="screenLog()" <?=_var($conf,'display_errors',0)?'checked':''?> disabled><span id="screentext" class="dim">_(Show errors on screen)_</span>
 
 <input type="button" value="_(PHP Info)_" onclick="PHPinfo()"><input type="button" id="clearlog" value="_(Clear Log)_" onclick="clearLog()"<?=filesize($log)>0?'':' disabled'?>><input type="button" id="viewlog" value="_(View Log)_" onclick="viewLog()" disabled>_(LOG size)_:&nbsp;<span id="logsize"></span>
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <div id="dialogWindow"></div>
diff --git a/emhttp/plugins/dynamix/ParityCheck.page b/emhttp/plugins/dynamix/ParityCheck.page
index 1f2e7c39c..b68f307eb 100644
--- a/emhttp/plugins/dynamix/ParityCheck.page
+++ b/emhttp/plugins/dynamix/ParityCheck.page
@@ -227,5 +227,8 @@ _(Accumulation duration)_:
 
 </div>
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"></td>
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/PowerMode.page b/emhttp/plugins/dynamix/PowerMode.page
index c71c65882..03be51bee 100644
--- a/emhttp/plugins/dynamix/PowerMode.page
+++ b/emhttp/plugins/dynamix/PowerMode.page
@@ -68,7 +68,10 @@ _(Change power mode)_:
   </span>
 
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <div id="vm" class="notice">_(When running Unraid virtualized, there are no available power modes)_</div>
diff --git a/emhttp/plugins/dynamix/RoutingTable.page b/emhttp/plugins/dynamix/RoutingTable.page
index 7c3b17287..abe4f1935 100644
--- a/emhttp/plugins/dynamix/RoutingTable.page
+++ b/emhttp/plugins/dynamix/RoutingTable.page
@@ -82,6 +82,9 @@ _(Enter route + gateway + metric)_:
 :eth_routing_table_help:
 
 &nbsp;
-: <input type="submit" value="_(Add Route)_"><input type="button" value="_(Done)_" class="lock" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Add Route)_">
+    <input type="button" value="_(Done)_" class="lock" onclick="done()">
+  </span>
 </form>
 </div>
diff --git a/emhttp/plugins/dynamix/SMBActiveDirectory.page b/emhttp/plugins/dynamix/SMBActiveDirectory.page
index 1952ae5bf..8f6d4d164 100644
--- a/emhttp/plugins/dynamix/SMBActiveDirectory.page
+++ b/emhttp/plugins/dynamix/SMBActiveDirectory.page
@@ -48,5 +48,8 @@ _(AD initial group)_:
 : <input type="text" name="shareInitialGroup" maxlength="40" value="<?=htmlspecialchars($var['shareInitialGroup'])?>">
 
 &nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeShare" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/SMBExtras.page b/emhttp/plugins/dynamix/SMBExtras.page
index ffeeaefc9..483b78a16 100644
--- a/emhttp/plugins/dynamix/SMBExtras.page
+++ b/emhttp/plugins/dynamix/SMBExtras.page
@@ -36,7 +36,11 @@ _(Samba extra configuration)_:
 : <textarea spellcheck="false" cols="80" rows="<?=substr_count($text,"\n")+1?>" maxlength="2048" name="text" <?if ($var['fsState']=="Started"):?>disabled<?endif;?>><?=htmlspecialchars($text)?></textarea>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+<?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
 
 :smb_extra_button_help:
 
diff --git a/emhttp/plugins/dynamix/SMBWorkGroup.page b/emhttp/plugins/dynamix/SMBWorkGroup.page
index 7d0ceaf94..279fb27d1 100644
--- a/emhttp/plugins/dynamix/SMBWorkGroup.page
+++ b/emhttp/plugins/dynamix/SMBWorkGroup.page
@@ -32,5 +32,9 @@ _(Local master)_:
 
 <?endif?>
 &nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
+: <span class="inline-block">
+    <input type="submit" name="changeShare" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+<?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
 </form>
diff --git a/emhttp/plugins/dynamix/SMBsettings.page b/emhttp/plugins/dynamix/SMBsettings.page
index 8f1587237..f7e4a6f8e 100644
--- a/emhttp/plugins/dynamix/SMBsettings.page
+++ b/emhttp/plugins/dynamix/SMBsettings.page
@@ -71,7 +71,11 @@ _(WSD options [experimental])_:
 :smb_wsd_options_help:
 
 &nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
+: <span class="inline-block">
+    <input type="submit" name="changeShare" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+<?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
 </form>
 
 <script>
diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page
index cd936c6b3..ca111e255 100644
--- a/emhttp/plugins/dynamix/SecurityNFS.page
+++ b/emhttp/plugins/dynamix/SecurityNFS.page
@@ -73,7 +73,10 @@ _(Security)_:
   </select>
 
 &nbsp;
-: <input type="submit" name="changeShareSecurityNFS" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" name="changeShareSecurityNFS" value="_(Apply)_" disabled>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <?if ($sec_nfs[$name]['security']=='private'):?>
@@ -85,7 +88,10 @@ _(Rule)_:
 :nfs_security_rules_help:
 
 &nbsp;
-: <input type="submit" name="changeShareAccessNFS" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" name="changeShareAccessNFS" value="_(Apply)_" disabled>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 <?endif;?>
 
diff --git a/emhttp/plugins/dynamix/SecuritySMB.page b/emhttp/plugins/dynamix/SecuritySMB.page
index b460cb384..82ede8801 100644
--- a/emhttp/plugins/dynamix/SecuritySMB.page
+++ b/emhttp/plugins/dynamix/SecuritySMB.page
@@ -55,6 +55,9 @@ foreach ($rows as $row) echo $row;
 
 <form markdown="1" name="smb_edit" method="POST" action="/update.htm" target="progressFrame" onchange="toggleButton('writesmb',true);$('#smb1').dropdownchecklist('disable')">
 <input type="hidden" name="shareName" value="<?=htmlspecialchars($name)?>">
+<?if (($name=='flash')||($var['enableFruit']!='yes')):?>
+  <input type="hidden" name="shareVolsizelimit" value="">
+<?endif;?>
 
 _(Share name)_:
 : <?=htmlspecialchars($name)?>
@@ -69,7 +72,6 @@ _(Export)_:
 
 :smb_export_help:
 
-<input type="hidden" name="shareVolsizelimit" value="">
 <?else:?>
 _(Export)_:
 : <select name="shareExport" onchange="checkShareSettingsSMB(this.form)">
@@ -104,12 +106,16 @@ _(Security)_:
   <?=mk_option($sec[$name]['security'], "public", _('Public'))?>
   <?=mk_option($sec[$name]['security'], "secure", _('Secure'))?>
   <?=mk_option($sec[$name]['security'], "private", _('Private'))?>
-  </select><span id="warningMessage" style="display:none; color: red;">_(Warning)_:  _(Windows may require a valid User to be defined even for Public shares)_.  _(See Help)_.</span>
+  </select>
+  <span id="warningMessage" style="display:none; color: red;">_(Warning)_:  _(Windows may require a valid User to be defined even for Public shares)_.  _(See Help)_.</span>
 
 :smb_security_modes_help:
 
 &nbsp;
-: <input type="submit" name="changeShareSecurity" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeShareSecurity" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <?if ($sec[$name]['security']=='secure'):?>
@@ -151,7 +157,10 @@ foreach ($rows as $row) echo $row;
 <?input_secure_users($sec)?>
 
 &nbsp;
-: <input type="submit" name="changeShareAccess" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeShareAccess" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <?elseif ($sec[$name]['security']=='private'):?>
@@ -190,10 +199,14 @@ foreach ($rows as $row) echo $row;
 
 <form markdown="1" name="smb_user_edit" method="POST" action="/update.htm" target="progressFrame" onchange="toggleButton('writeusersmb',true);$('#smb2').dropdownchecklist('disable')">
 <input type="hidden" name="shareName" value="<?=htmlspecialchars($name)?>">
+
 <?input_private_users($sec)?>
 
 &nbsp;
-: <input type="submit" name="changeShareAccess" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="changeShareAccess" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 <?endif;?>
 
diff --git a/emhttp/plugins/dynamix/Selftest.page b/emhttp/plugins/dynamix/Selftest.page
index 63f2981aa..9951ba5ec 100644
--- a/emhttp/plugins/dynamix/Selftest.page
+++ b/emhttp/plugins/dynamix/Selftest.page
@@ -22,29 +22,40 @@ $zip  = str_replace(' ','_',strtolower(_var($var,'NAME','tower')))."-smart-$date
 $long = !isset($disks[$name]['spindownDelay']) || _var($disks[$name],'spindownDelay')==0 || (_var($disks[$name],'spindownDelay')==-1 && _var($var,'spindownDelay')==0);
 ?>
 _(Download SMART report)_:
-: <input type='button' value="_(Download)_" onclick='saveSMART()'>
+: <span class="inline-block">
+    <input type='button' value="_(Download)_" onclick='saveSMART()'>
+  </span>
 
 _(SMART self-test history)_:
-: <input type="button" value="_(Show)_" id="toggle_log" onclick="selftestLog()">
+: <span class="inline-block">
+    <input type="button" value="_(Show)_" id="toggle_log" onclick="selftestLog()">
+  </span>
 
 :selftest_history_help:
 
 <pre id="selftest" style="display:none"></pre>
 
 _(SMART error log)_:
-: <input type="button" value="_(Show)_" id="toggle_error" onclick="errorLog()">
+: <span class="inline-block">
+    <input type="button" value="_(Show)_" id="toggle_error" onclick="errorLog()">
+  </span>
 
 :selftest_error_log_help:
 
 <pre id="errorlog" style="display:none"></pre>
 
 _(SMART short self-test)_:
-: <input type='button' value="_(Start)_" id='short_test' onclick="startShortTest()">
+: <span class="inline-block">
+    <input type='button' value="_(Start)_" id='short_test' onclick="startShortTest()">
+  </span>
 
 :selftest_short_test_help:
 
 _(SMART extended self-test)_:
-: <input type='button' value="_(Start)_" id='long_test' onclick="startLongTest()"<?=$long ? ">" : " disabled> _(Disable **Spin down delay** to run a SMART extended self-test)_"?>
+: <span class="inline-block">
+    <input type='button' value="_(Start)_" id='long_test' onclick="startLongTest()"<?=$long ? "" : " disabled"?>>
+    <?php if (!$long): ?><span>_(Disable **Spin down delay** to run a SMART extended self-test)_</span><?php endif; ?>
+  </span>
 
 :selftest_long_test_help:
 
diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 8a00eb194..af0952eb2 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -568,11 +568,17 @@ _(Mover action)_:
 </div>
 <?if (!$name):?>
 &nbsp;
-: <input type="submit" name="cmdEditShare" value="_(Add Share)_" onclick="this.value='Add Share'"><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" name="cmdEditShare" value="_(Add Share)_" onclick="this.value='Add Share'">
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 <?else:?>
 <div markdown="1">
 <label id="deleteLabel" title="">_(Delete)_</label><input type="checkbox" name="confirmDelete" onchange="chkDelete(this.form, document.getElementById('cmdEditShare'));" title="" disabled>
-: <input type="submit" id="cmdEditShare" name="cmdEditShare" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply'; return handleDeleteClick(this)" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+	<input type="submit" id="cmdEditShare" name="cmdEditShare" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply'; return handleDeleteClick(this)" disabled>
+	<input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </div>
 <?endif;?>
 </form>
diff --git a/emhttp/plugins/dynamix/ShareSettings.page b/emhttp/plugins/dynamix/ShareSettings.page
index dae587b26..db52158ef 100644
--- a/emhttp/plugins/dynamix/ShareSettings.page
+++ b/emhttp/plugins/dynamix/ShareSettings.page
@@ -160,5 +160,9 @@ _(Number of fuse File Descriptors)_:
 :shares_fuse_file_descriptors_io_help:
 
 &nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($disabled):?>*_(Array must be **Stopped** to change)_*<?endif;?>
+: <span class="inline-block">
+    <input type="submit" name="changeShare" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+<?if ($disabled):?>*_(Array must be **Stopped** to change)_*<?endif;?>
 </form>
diff --git a/emhttp/plugins/dynamix/SmtpSettings.page b/emhttp/plugins/dynamix/SmtpSettings.page
index 4ddb0c6f0..58a62aeb1 100644
--- a/emhttp/plugins/dynamix/SmtpSettings.page
+++ b/emhttp/plugins/dynamix/SmtpSettings.page
@@ -186,6 +186,9 @@ _(Password)_:
 :smtp_username_password_help:
 
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
-  <span id="testresult"><input type="button" id="testbutton" value="_(Test)_"<?if ($incomplete):?> disabled<?endif;?>></span>
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+    <span id="testresult"><input type="button" id="testbutton" value="_(Test)_"<?if ($incomplete):?> disabled<?endif;?>></span>
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/TrimSettings.page b/emhttp/plugins/dynamix/TrimSettings.page
index 8cb8807af..ec77ca257 100644
--- a/emhttp/plugins/dynamix/TrimSettings.page
+++ b/emhttp/plugins/dynamix/TrimSettings.page
@@ -123,5 +123,9 @@ _(Time of the day)_:
 :end
 
 &nbsp;
-: <input type="submit" name="#apply" value="_(Apply)_"><input type="button" value="_(Done)_" onclick="done()"><input type="button" value="_(Trim Now)_" onclick="trimNow()">
+: <span class="inline-block">
+    <input type="submit" name="#apply" value="_(Apply)_">
+    <input type="button" value="_(Done)_" onclick="done()">
+    <input type="button" value="_(Trim Now)_" onclick="trimNow()">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/UserAdd.page b/emhttp/plugins/dynamix/UserAdd.page
index e32f64c22..cae11eef4 100644
--- a/emhttp/plugins/dynamix/UserAdd.page
+++ b/emhttp/plugins/dynamix/UserAdd.page
@@ -172,5 +172,8 @@ _(Retype password)_:
 : <input type="password" name="userPasswordConfGUI" maxlength="129" autocomplete="new-password" onKeyUp="this.form.cmdUserEdit.disabled=(this.form.userName.value=='' || this.form.userPasswordGUI.value!=this.form.userPasswordConfGUI.value)">
 
 &nbsp;
-: <input type="submit" name="cmdUserEdit" value="_(Add)_" onclick="this.value='Add'" disabled><input type="button" value="_(Done)_" onclick="done('UserAdd')">
+: <span class="inline-block">
+    <input type="submit" name="cmdUserEdit" value="_(Add)_" onclick="this.value='Add'" disabled>
+    <input type="button" value="_(Done)_" onclick="done('UserAdd')">
+  </span>
 </form>
diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page
index 16121aa22..dd5bf19ec 100644
--- a/emhttp/plugins/dynamix/UserEdit.page
+++ b/emhttp/plugins/dynamix/UserEdit.page
@@ -197,7 +197,10 @@ _(Custom image)_:
 <?else:?>
 _(Delete)_<input type="checkbox" name="confirmDelete" onChange="chkDelete(this.form, this.form.cmdUserEdit)">
 <?endif;?>
-: <input type="submit" name="cmdUserEdit" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply';" disabled><input type="button" value="_(Done)_" onclick="done('UserEdit')">
+: <span class="inline-block">
+    <input type="submit" name="cmdUserEdit" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply';" disabled>
+    <input type="button" value="_(Done)_" onclick="done('UserEdit')">
+  </span>
 </form>
 <br><br>
 <form markdown="1" method="POST" action="/update.htm" onsubmit="return checkPassword(this)" target="progressFrame">
@@ -215,7 +218,10 @@ _(Retype password)_:
   <input type="password" name="userPasswordConfGUI" maxlength="129" autocomplete="new-password" onKeyUp="this.form.cmdUserEdit.disabled=(this.form.userPasswordGUI.value != this.form.userPasswordConfGUI.value);">
 
 &nbsp;
-: <input type="submit" name="cmdUserEdit" value="_(Change)_" onclick="this.value='Change'" disabled><input type="button" value="_(Done)_" onclick="done('UserEdit')">
+: <span class="inline-block">
+    <input type="submit" name="cmdUserEdit" value="_(Change)_" onclick="this.value='Change'" disabled>
+    <input type="button" value="_(Done)_" onclick="done('UserEdit')">
+  </span>
 </form>
 
 <?if ($name == 'root'):?>
@@ -227,7 +233,10 @@ _(SSH authorized keys)_:
 : <textarea spellcheck="false" cols="80" rows="<?=max(substr_count($text,"\n")+1,10)?>" maxlength="16384" name="text" style="resize:none;white-space:normal;font-family:bitstream;width:65.5%"><?=htmlspecialchars($text)?></textarea>
 
 &nbsp;
-: <input type="submit" value="_(Save)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Save)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 
 </form>
 <?endif;?>
diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index e21ac8820..798bb9ac4 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -1476,8 +1476,12 @@ _(Persistent keepalive)_:
 <?endforeach;?>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wg0),'wg0'))" disabled><input type="button" value="_(Done)_" onclick="done()"><input type="button" id="addpeer-wg0" value="_(Add Peer)_" onclick="addPeer($(document.wg0),'wg0')">
-  <input type="button" class="advanced wg0" value="_(Delete Tunnel)_" style="float:right;display:none" onclick="delTunnel('wg0')"<?=file_exists($conf_wg0)?'':' disabled'?>>
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wg0),'wg0'))" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+    <input type="button" id="addpeer-wg0" value="_(Add Peer)_" onclick="addPeer($(document.wg0),'wg0')">
+    <input type="button" class="advanced wg0" value="_(Delete Tunnel)_" style="display:none" onclick="delTunnel('wg0')"<?=file_exists($conf_wg0)?'':' disabled'?>>
+  </span>
 </form>
 <small style="position:absolute;left:10px;top:30px">"WireGuard" and the "WireGuard" logo are registered trademarks of Jason A. Donenfeld</small>
 
diff --git a/emhttp/plugins/dynamix/WGX.page b/emhttp/plugins/dynamix/WGX.page
index 069f568ad..442c0a21c 100644
--- a/emhttp/plugins/dynamix/WGX.page
+++ b/emhttp/plugins/dynamix/WGX.page
@@ -374,7 +374,12 @@ _(Persistent keepalive)_:
 <?endforeach;?>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wgX),'wgX'))" disabled><input type="button" value="_(Done)_" onclick="done()"><input type="button" id="addpeer-wgX" value="_(Add Peer)_" onclick="addPeer($(document.wgX),'wgX')"><input type="button" class="advanced wgX" value="_(Delete Tunnel)_" style="float:right;display:none" onclick="delTunnel('wgX')">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wgX),'wgX'))" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+    <input type="button" id="addpeer-wgX" value="_(Add Peer)_" onclick="addPeer($(document.wgX),'wgX')">
+    <input type="button" class="advanced wgX" value="_(Delete Tunnel)_" style="display:none" onclick="delTunnel('wgX')">
+  </span>
 </form>
 
 <script markdown="1" type="text/html" id="peer-template-wgX">
diff --git a/emhttp/plugins/dynamix/Wireless.page b/emhttp/plugins/dynamix/Wireless.page
index afe7636a5..e7fca00c1 100644
--- a/emhttp/plugins/dynamix/Wireless.page
+++ b/emhttp/plugins/dynamix/Wireless.page
@@ -45,7 +45,10 @@ _(Regulatory region)_:
 ?></select><span id="manual" class="hide">_(Manual input)_ [XX]: <input type="text" name="REGION_XX" class="wifi" value="<?=_var($wlan0,'REGION_XX')?>" minlength="2" maxlength="2" title="_(Two letter country code)_ (ISO 3166)"></span>
 
 &nbsp;
-: <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_" disabled>
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
 </form>
 
 <div id="wifi" class="hide">