diff --git a/plugins/date/form_date.cs b/plugins/date/form_date.cs
index 71d0d47..0af8a08 100644
--- a/plugins/date/form_date.cs
+++ b/plugins/date/form_date.cs
@@ -2,6 +2,25 @@
 
 <?cs call:handle_messages() ?>
 
+
+<?cs # sort the Plugins - using the most stupid way :) 
+ TODO: this is just an example, remove it or put in macros ?>
+<div class="plugin_system_small">
+<?cs loop: order = #0, #100, #1
+	?><?cs # plugins ?><?cs each:x = Settings.PluginList
+		?><?cs if:x.Types.system && x.Visible.preferences && x.Rank == order ?>
+			<a href="<?cs
+				call:link(name(x),'','','','') ?>" title="<?cs
+				var:html_escape(Lang.Plugins[name(x)].Link) ?>"><img src="<?cs
+				call:link('icons/' + name(x), '','','','') ?>" alt="<?cs
+				var:html_escape('icon: ' + x.Name) ?>" />
+			<?cs
+		/if ?><?cs
+	/each ?><?cs
+/loop ?>
+</div>
+
+
 <fieldset>
 	<legend>
 		<?cs call:show_plugin_icon() ?>
diff --git a/plugins/plugin_manager/language.hdf b/plugins/plugin_manager/language.hdf
index cb61574..24ce9d3 100644
--- a/plugins/plugin_manager/language.hdf
+++ b/plugins/plugin_manager/language.hdf
@@ -25,8 +25,8 @@ 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. 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.
+	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 column '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 for configuration, activation and generall handling of volumes. 'Register' is the tab-based main interface for volume management which appears if you click on a volume. 'Preferences' is one of these tabs can be be filled with volume plugins to reduce the tabs in the volumes interface.
 	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 532ab15..7525b9a 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -20,7 +20,7 @@
 
 	<table class="plugin_list">
 		<tr>
-			<th></th>
+			<th width="40%"></th>
 			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
 			<th></th>
 			<th></th>
@@ -51,7 +51,7 @@
 			<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 
+					?>&amp;x=<?cs var:run_counter ?>#volume_plugins"><img class="arrow"
 					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) 
@@ -80,7 +80,7 @@
 	<?cs call:show_help(Lang.Plugins.plugin_manager.Help.SystemPlugins) ?>
 	<table class="plugin_list">
 		<tr>
-			<th></th>
+			<th width="40%"></th>
 			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
 			<th></th>
 			<th></th>
diff --git a/plugins/user_manager/user_list.cs b/plugins/user_manager/user_list.cs
index 0e4819b..c1d0a92 100644
--- a/plugins/user_manager/user_list.cs
+++ b/plugins/user_manager/user_list.cs
@@ -7,6 +7,7 @@
 	<legend>
 		<?cs call:show_plugin_icon() ?>
 		<?cs var:html_escape(Lang.Plugins.user_manager.Title.AddUser) ?>
+	</legend>
 	<?cs call:show_help(Lang.Plugins.user_manager.Help.AddUser) ?>
 	<?cs call:print_form_header("add_user", "user_manager") ?>
 	<table class="user_manager">
@@ -33,6 +34,7 @@
 	<legend>
 		<?cs call:show_plugin_icon() ?>
 		<?cs var:html_escape(Lang.Plugins.user_manager.Title.ChangePassword) ?>
+	</legend>
 	<?cs call:show_help(Lang.Plugins.user_manager.Help.ChangePassword) ?>
 	<?cs call:print_form_header("change_password", "user_manager") ?>
 	<table class="user_manager">
@@ -60,7 +62,10 @@
 
 <?cs if:subcount(Data.Plugins.user_manager.Users) > 1 ?>
 <fieldset>
-<legend><?cs var:html_escape(Lang.Plugins.user_manager.Title.DelUser) ?></legend>
+	<legend>
+		<?cs call:show_plugin_icon() ?>
+		<?cs var:html_escape(Lang.Plugins.user_manager.Title.DelUser) ?>
+	</legend>
 	<?cs call:show_help(Lang.Plugins.user_manager.Help.DelUser) ?>
 	<table><tr><td class="left_column">
 	<?cs call:print_form_header("del_user", "user_manager") ?>
diff --git a/www-data/cryptobox.css b/www-data/cryptobox.css
index 8b75d98..53c6e55 100644
--- a/www-data/cryptobox.css
+++ b/www-data/cryptobox.css
@@ -349,6 +349,14 @@ div.plugin_system_title img {
 	padding-right: 10px;
 }
 
+div.plugin_system_small img {
+	float: left;
+	width: 24px;
+	height: 24px;
+	padding-left: 15px;
+	padding-bottom: 5px;
+}
+
 div.volume {
 	/* FIXME: float-left breaks the background image in firefox */
 	float: left;