diff --git a/plugins/format_fs/volume_format.cs b/plugins/format_fs/volume_format.cs
index ba9ed14..4b87f7a 100644
--- a/plugins/format_fs/volume_format.cs
+++ b/plugins/format_fs/volume_format.cs
@@ -27,9 +27,9 @@
 
 		<p><input type="checkbox" name="confirm" value="1" id="confirm" /><label for="confirm"><?cs var:html_escape(Lang.Plugins.format_fs.Text.Confirm) ?></label></p>
 
-		<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
+		<p><input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
 		<input type="hidden" name="store" value="step1" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.format_fs.Button.Format) ?></button>
+		<button type="submit"><?cs var:html_escape(Lang.Plugins.format_fs.Button.Format) ?></button></p>
 	</form>
 
 <?cs /if ?>
diff --git a/plugins/format_fs/volume_format_luks.cs b/plugins/format_fs/volume_format_luks.cs
index e2c52bb..9a229e1 100644
--- a/plugins/format_fs/volume_format_luks.cs
+++ b/plugins/format_fs/volume_format_luks.cs
@@ -20,11 +20,11 @@
 
 		<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label> <input type="password" id="crypto_password" name="crypto_password" /></p>
 		<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label> <input type="password" id="crypto_password2" name="crypto_password2" /></p>
-		<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
+		<p><input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
 		<input type="hidden" name="fs_type" value="<?cs var:html_escape(Data.Plugins.format_fs.fs_type) ?>" />
 		<input type="hidden" name="container_type" value="<?cs var:html_escape(Data.Plugins.format_fs.container_type) ?>" />
 		<input type="hidden" name="store" value="step2" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.format_fs.Button.Format) ?></button>
+		<button type="submit"><?cs var:html_escape(Lang.Plugins.format_fs.Button.Format) ?></button></p>
 	</form>
 
 <?cs /if ?>
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index dbeb8ae..e0657c1 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -26,11 +26,11 @@
 <?cs call:handle_messages() ?>
 
 
-<h2><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.VolumePlugins) ?></h2>
+<h2><a name="volume_plugins"/><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.VolumePlugins) ?></h2>
 
 <?cs call:print_form_header("manage_plugins", "plugin_manager") ?>
 
-<p><table class="plugin_list">
+<table class="plugin_list">
 	<tr>
 		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginName) ?></th>
 		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginEnabled) ?></th>
@@ -43,24 +43,24 @@
 <?cs set:run_counter = 0 ?><?cs
 loop: index = #0, #100, #1 ?><?cs
 each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && x.Types.volume
-	?><?cs set: run_counter = run_counter + 1
-	?><input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /><tr>
+	?><?cs set: run_counter = run_counter + 1 ?><tr>
 		<td style="text-align:left"><a name="<?cs var:html_escape(name(x)) ?>"><?cs var:html_escape(x.Name) ?></a></td>
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_visible_volume" <?cs if:x.Visible.volume ?>checked="checked"<?cs /if ?> /></td>
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_auth" <?cs if:x.RequestAuth ?>checked="checked"<?cs /if ?> /></td>
 		<td>
-			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>">
+			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>#volume_plugins">
 				<img src="icons/plugin_manager?image=tango-go-down.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
-			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>" >
+			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>#volume_plugins" >
 				<img src="icons/plugin_manager?image=tango-go-up.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
-			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" /></td>
+			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" />
+			<input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /></td>
 	</tr><?cs /if ?><?cs /each ?><?cs /loop ?>
-</table></p>
+</table>
 
 
-<h2><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.SystemPlugins) ?></h2>
+<h2><a name="system_plugins"/><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.SystemPlugins) ?></h2>
 
-<p><table class="plugin_list">
+<table class="plugin_list">
 	<tr>
 		<th></th>
 		<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
@@ -81,20 +81,20 @@ each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && x.Types.volume
 <?cs set:run_counter = 0 ?><?cs
 loop:index = #0, #100, #1 ?><?cs
 each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && !x.Types.volume
-	?><?cs set: run_counter = run_counter + 1
-	?><input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /><tr>
+	?><?cs set: run_counter = run_counter + 1 ?><tr>
 		<td style="text-align:left"><a name="<?cs var:html_escape(name(x)) ?>"><?cs var:html_escape(x.Name) ?></a></td>
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_visible_menu" <?cs if:x.Visible.menu ?>checked="checked"<?cs /if ?> /></td>
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_visible_preferences" <?cs if:x.Visible.preferences ?>checked="checked"<?cs /if ?> /></td>
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_auth" <?cs if:x.RequestAuth ?>checked="checked"<?cs /if ?> /></td>
 		<td>
-			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>">
+			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>#system_plugins">
 				<img src="icons/plugin_manager?image=tango-go-down.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
-			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>" >
-				<img src="icons/plugin_manager?image=tango-go-up.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" value="<?cs var:x.Rank ?>" /></a><?cs /if ?>
-			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" /></td>
+			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>#<?cs var:html_escape(name(x)) ?>" >
+				<img src="icons/plugin_manager?image=tango-go-up.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
+			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" />
+			<input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /></td>
 	</tr><?cs /if ?><?cs /each ?><?cs /loop ?>
-</table></p>
+</table>
 
 <p>
 	<input type="hidden" name="store" value="1" />
diff --git a/plugins/volume_details/volume_details.cs b/plugins/volume_details/volume_details.cs
index ecc0a53..6375a5c 100644
--- a/plugins/volume_details/volume_details.cs
+++ b/plugins/volume_details/volume_details.cs
@@ -6,7 +6,7 @@
 
 <?cs call:handle_messages() ?>
 
-<p><ul>
+<ul>
 	<li><?cs var:html_escape(Lang.Text.ContainerName) ?>: <?cs var:html_escape(Data.CurrentDisk.name) ?></li>
 	<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.DeviceName) ?>: <?cs var:html_escape(Data.CurrentDisk.device) ?></li>
 	<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.Status) ?>: <?cs if:Data.CurrentDisk.active ?><?cs var:html_escape(Lang.Plugins.volume_details.Text.StatusActive) ?><?cs else ?><?cs var:html_escape(Lang.Plugins.volume_details.Text.StatusPassive) ?><?cs /if ?></li>
@@ -16,6 +16,6 @@
 		<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.Size.Avail) ?>: <?cs var:html_escape(Data.CurrentDisk.capacity.free) ?></li>
 		<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.Size.Used) ?>: <?cs var:html_escape(Data.CurrentDisk.capacity.percent) ?>%</li>
 	<?cs /if ?>
-</ul></p>
+</ul>
 
 <?cs include:Settings.TemplateDir + "/show_volume_footer.cs" ?>
diff --git a/plugins/volume_mount/volume_mount.cs b/plugins/volume_mount/volume_mount.cs
index 407eb21..3566701 100644
--- a/plugins/volume_mount/volume_mount.cs
+++ b/plugins/volume_mount/volume_mount.cs
@@ -2,7 +2,7 @@
 
 <?cs call:handle_messages() ?>
 
-<p><?cs call:print_form_header("mount", "volume_mount") ?>
+<?cs call:print_form_header("mount", "volume_mount") ?><p>
 	<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
 	<?cs if:Data.CurrentDisk.encryption ?>
 		<input type="hidden" name="action" value="mount_luks" />
@@ -14,5 +14,5 @@
 		<input type="password" tabindex="1" id="pw" name="pw" size="20" maxlength="60" />
 	<?cs /if ?>
 	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Mount) ?></button>
-</form></p>
+</p></form>
 
diff --git a/plugins/volume_props/volume_properties.cs b/plugins/volume_props/volume_properties.cs
index 92c3fe6..ebf12b5 100644
--- a/plugins/volume_props/volume_properties.cs
+++ b/plugins/volume_props/volume_properties.cs
@@ -17,15 +17,14 @@
 	<tr><td colspan="3">
 		<h3><?cs var:html_escape(Lang.Plugins.volume_props.Title.ChangeVolumeName) ?></h3>
 	</td></tr>
-	<?cs call:print_form_header("set_name", "volume_props") ?><tr>
-		<td align="right"><label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label></td>
+	<tr><td align="right"><?cs call:print_form_header("set_name", "volume_props") ?>
+		<label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label></td>
 		<td><input type="text" name="vol_name" tabindex="10" size="15" id="vol_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" /></td>
 		<td>
 			<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
 			<input type="hidden" name="store" value="set_name" />
 			<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Plugins.volume_props.Button.ContainerNameSet) ?></button>
-		</td>
-	</tr></form>
+		</form></td></tr>
 	<tr><td></td><td></td><td></td></tr>
 
 
@@ -63,7 +62,7 @@
 		<tr><td colspan="2" align="left"><?cs var:html_escape(Lang.Plugins.volume_props.Text.FormatForEncryptionSupport) ?></td>
 		<td>
 			<?cs call:print_form_header("enable_encryption", "format_fs") ?>
-			<button type="submit" tabindex="30"><?cs var:html_escape(Lang.Plugins.volume_props.Button.FormatContainer) ?></button>
+			<p><button type="submit" tabindex="30"><?cs var:html_escape(Lang.Plugins.volume_props.Button.FormatContainer) ?></button></p></form>
 		</td></tr>
 
 	<?cs /if ?>