diff --git a/plugins/plugin_manager/language.hdf b/plugins/plugin_manager/language.hdf
index 321f473..25e9085 100644
--- a/plugins/plugin_manager/language.hdf
+++ b/plugins/plugin_manager/language.hdf
@@ -8,7 +8,7 @@ Title {
 }
 
 Button {
-	SaveSettings	= Save settings
+	SaveSettings	= Save all settings
 	Up	= move up
 	Down	= move down
 }
@@ -25,7 +25,7 @@ Text {
 }
 
 Help {
-	PluginManager	= All features of the CryptoBox are provided by plugins. This makes it possible to extend the CryptoBox easily. Here you may disable some of the available plugins to prevent unwanted user actions. Alternatively you can demand administrative privileges (see 'User manager') to protect dangerous actions from random access. The rightmost colum 'order' can be used to change the order of appearance of the plugins.
+	PluginManager	= All features of the CryptoBox are provided by plugins. This makes it possible to extend the CryptoBox easily. Here you may disable some of the available plugins to prevent unwanted user actions. Alternatively you can demand administrative privileges (see 'User manager') to protect dangerous actions from random access. The rightmost colum 'order' can be used to change the order of appearance of the plugins. Don't forget to save the settings.
 	VolumePlugins	= Volume plugins are used to manipulate volumes in any way. The plugin 'Volume properties' can be used as a container for other plugins to increase the clearness of the interface. 'Register' is the tab-based main interface for volume management.
 	SystemPlugins	= System plugins can change various aspects of the CryptoBox. They may be listed in the main navigation bar (the leftmost part of every page) and/or in the 'System preferences' container. You should never disable the 'Plugin manager'.
 }
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index 6075b15..3a22c65 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -10,116 +10,117 @@
 	from thinking, that it can use the cached page again, if a user calls the "down" or
 	"up" action twice for the same plugin ?>
 
-<h2><a name="volume_plugins"><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.VolumePlugins) ?></a></h2>
-
-<?cs call:show_help(Lang.Plugins.plugin_manager.Help.VolumePlugins) ?>
-
+<?cs # <form> starts here ?>
 <?cs call:print_form_header("manage_plugins", "plugin_manager") ?>
 
-<table class="plugin_list">
-	<tr>
-		<th></th>
-		<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
-		<th></th>
-		<th></th>
-		<th></th>
-	</tr>
-	<tr>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginName) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InVolumeRegister) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InVolumeProperties) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.RequestsAuth) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginRank) ?></th>
-	</tr>
-<?cs # count volume plugins ?><?cs set: all_count = #0
-	?><?cs each:x = Settings.PluginList ?><?cs if: x.Types.volume ?><?cs
-		set: all_count = all_count + 1 ?><?cs /if ?><?cs /each ?>
-<?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 ?><tr>
-		<td style="text-align:left"><a name="<?cs var:html_escape(name(x)) ?>"><?cs var:html_escape(Lang.Plugins[name(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) ?>_visible_properties" <?cs if:x.Visible.properties ?>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 class="updown">
-			<?cs if:run_counter != all_count ?><a href="<?cs
-				call:link("plugin_manager", "plugin_name", name(x), "action", "down")
-				?>&amp;x=<?cs var:run_counter ?>#volume_plugins"><img
-				src="icons/plugin_manager?image=tango-go-down.gif" 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") ?>&amp;x=<?cs
-				var:run_counter ?>#volume_plugins" ><img
-				src="icons/plugin_manager?image=tango-go-up.gif" 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>
-	<?cs # we show the button twice (see below) to improve the user experience :) ?>
-	<button type="submit"><?cs var:html_escape(Lang.Plugins.plugin_manager.Button.SaveSettings) ?></button>
-</p>
+<fieldset>
+	<legend><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.VolumePlugins) ?></legend>
+	<?cs call:show_help(Lang.Plugins.plugin_manager.Help.VolumePlugins) ?>
 
+	<table class="plugin_list">
+		<tr>
+			<th></th>
+			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
+			<th></th>
+			<th></th>
+			<th></th>
+		</tr>
+		<tr>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginName) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InVolumeRegister) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InVolumeProperties) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.RequestsAuth) ?></th>
+			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginRank) ?></th>
+		</tr>
+		<?cs # count volume plugins ?><?cs set: all_count = #0
+		?><?cs each:x = Settings.PluginList ?><?cs if: x.Types.volume ?><?cs
+			set: all_count = all_count + 1 ?><?cs /if ?><?cs /each ?>
+		<?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 ?>
+		<tr>
+			<td style="text-align:left"><a name="<?cs var:html_escape(name(x)) ?>"><?cs var:html_escape(Lang.Plugins[name(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) ?>_visible_properties" <?cs if:x.Visible.properties ?>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 class="down">
+				<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", 
+					"plugin_name", name(x), "action", "down") ?>&amp;x=<?cs 
+					var:run_counter ?>#volume_plugins"><img 
+					src="icons/plugin_manager?image=tango-go-down.gif" 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 ?>
+			</td>
+			<td class="up">
+				<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager",
+					"plugin_name", name(x), "action", "up") ?>&amp;x=<?cs
+					var:run_counter ?>#volume_plugins" ><img
+					src="icons/plugin_manager?image=tango-go-up.gif" 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>
+</fieldset>
 
-<h2><a name="system_plugins"><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.SystemPlugins) ?></a></h2>
+<fieldset>
+	<legend><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.SystemPlugins) ?></legend>
+	<?cs call:show_help(Lang.Plugins.plugin_manager.Help.SystemPlugins) ?>
+	<table class="plugin_list">
+		<tr>
+			<th></th>
+			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
+			<th></th>
+			<th></th>
+			<th></th>
+		</tr>
+	<?cs # count system plugins ?><?cs set: all_count = #0
+		?><?cs each:x = Settings.PluginList ?><?cs if: x.Types.system ?><?cs
+			set: all_count = all_count + 1 ?><?cs /if ?><?cs /each ?>
+		<tr>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginName) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InMenu) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InPreferences) ?></th>
+			<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.RequestsAuth) ?></th>
+			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginRank) ?></th>
+		</tr>
+	<?cs set:run_counter = 0 ?><?cs
+	loop:index = #0, #100, #1 ?><?cs
+	each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && x.Types.system
+		?><?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(Lang.Plugins[name(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 class="down">
+				<?cs if:run_counter != all_count ?><a href="<?cs
+					call:link("plugin_manager", "plugin_name", name(x), "action", "down")
+					?>&amp;x=<?cs var:run_counter ?>#system_plugins"><img
+					src="icons/plugin_manager?image=tango-go-down.gif" 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 ?>
+			<td class="up">
+				<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager",
+					"plugin_name", name(x), "action", "up") ?>&amp;x=<?cs var:run_counter
+					?>#<?cs var:html_escape(name(x)) ?>" ><img
+					src="icons/plugin_manager?image=tango-go-up.gif" 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>
 
-<?cs call:show_help(Lang.Plugins.plugin_manager.Help.SystemPlugins) ?>
-
-<table class="plugin_list">
-	<tr>
-		<th></th>
-		<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
-		<th></th>
-		<th></th>
-		<th></th>
-	</tr>
-<?cs # count system plugins ?><?cs set: all_count = #0
-	?><?cs each:x = Settings.PluginList ?><?cs if: x.Types.system ?><?cs
-		set: all_count = all_count + 1 ?><?cs /if ?><?cs /each ?>
-	<tr>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginName) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InMenu) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.InPreferences) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.RequestsAuth) ?></th>
-		<th><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.PluginRank) ?></th>
-	</tr>
-<?cs set:run_counter = 0 ?><?cs
-loop:index = #0, #100, #1 ?><?cs
-each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && x.Types.system
-	?><?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(Lang.Plugins[name(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 class="updown">
-			<?cs if:run_counter != all_count ?><a href="<?cs
-				call:link("plugin_manager", "plugin_name", name(x), "action", "down")
-				?>&amp;x=<?cs var:run_counter ?>#system_plugins"><img
-				src="icons/plugin_manager?image=tango-go-down.gif" 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") ?>&amp;x=<?cs var:run_counter
-				?>#<?cs var:html_escape(name(x)) ?>" ><img
-				src="icons/plugin_manager?image=tango-go-up.gif" 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>
+</fieldset>
 
 <p>
-	<input type="hidden" name="store" value="1" />
 	<button type="submit"><?cs var:html_escape(Lang.Plugins.plugin_manager.Button.SaveSettings) ?></button>
 </p>