diff --git a/plugins/volume_automount/volume_automount.cs b/plugins/volume_automount/volume_automount.cs
index 07fe1fa..ea098bb 100644
--- a/plugins/volume_automount/volume_automount.cs
+++ b/plugins/volume_automount/volume_automount.cs
@@ -1,9 +1,13 @@
-<?cs # $Id$ ?>
+<!-- <?cs # $Id$ ?>
 
 <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_automount.Title.AutoMountVolume) ?></<?cs var:plugin_heading ?>>
+-->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_automount.Title.AutoMountVolume) ?> </legend>
+
 <?cs call:show_help(Lang.Plugins.volume_automount.Help.AutoMount) ?>
 
 <?cs if:!Data.CurrentDisk.encryption ?>
@@ -22,4 +26,5 @@
 <?cs else ?>
 	<?cs call:hint("Plugins.volume_automount.NoAutoMountForEncryptedVolumes") ?>
 <?cs /if ?>
+</fieldset>
 
diff --git a/plugins/volume_chpasswd/language.hdf b/plugins/volume_chpasswd/language.hdf
index 705bd99..777042e 100644
--- a/plugins/volume_chpasswd/language.hdf
+++ b/plugins/volume_chpasswd/language.hdf
@@ -11,7 +11,7 @@ Button {
 }
 
 
-Help.Password	= You can change the password of an encrypted volume easily. Just enter the current password and type the new password twice. No data will get lost.
+Help.Password	= You can easily change the password of an encrypted volume. Just enter the current password and type your new password twice. No data will get lost.
 
 
 AdviceMessage {
diff --git a/plugins/volume_chpasswd/volume_chpasswd.cs b/plugins/volume_chpasswd/volume_chpasswd.cs
index f38b697..8795e6c 100644
--- a/plugins/volume_chpasswd/volume_chpasswd.cs
+++ b/plugins/volume_chpasswd/volume_chpasswd.cs
@@ -1,9 +1,12 @@
 <?cs # $Id$ ?>
 
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_chpasswd.Title.ChangePassword) ?></<?cs var:plugin_heading ?>>
+<!-- <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_chpasswd.Title.ChangePassword) ?></<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_chpasswd.Title.ChangePassword) ?> </legend>
+
 <?cs call:show_help(Lang.Plugins.volume_chpasswd.Help.Password) ?>
 
 <?cs # show password change form only for encrypted volumes ?>
@@ -34,4 +37,5 @@
 <?cs else ?>
 	<?cs call:hint("Plugins.volume_chpasswd.FormatForEncryptionSupport") ?>
 <?cs /if ?>
+</fieldset>
 
diff --git a/plugins/volume_mount/volume_mount.cs b/plugins/volume_mount/volume_mount.cs
index b8eefb5..5cea8db 100644
--- a/plugins/volume_mount/volume_mount.cs
+++ b/plugins/volume_mount/volume_mount.cs
@@ -4,12 +4,12 @@
 
 <?cs call:handle_messages() ?>
 
-<?cs call:show_help(Lang.Plugins.volume_mount.Help.Open) ?>
 
 <fieldset>
-<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?>
+<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?> </legend>
+
+<?cs call:show_help(Lang.Plugins.volume_mount.Help.Open) ?>
 
-</legend>
 <?cs call:print_form_header("mount", "volume_mount") ?><p>
 	<table>
 		<tr>
@@ -34,4 +34,5 @@
 		</tr>
 	</table>
 </p></form>
+</fieldset>
 
diff --git a/plugins/volume_mount/volume_umount.cs b/plugins/volume_mount/volume_umount.cs
index 853561b..a7d8e53 100644
--- a/plugins/volume_mount/volume_umount.cs
+++ b/plugins/volume_mount/volume_umount.cs
@@ -1,11 +1,10 @@
 <!-- <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?></<?cs var:plugin_heading ?>> -->
 
-<fieldset>
-<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?>
-
-</legend>
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?> </legend>
+
 <?cs call:show_help(Lang.Plugins.volume_mount.Help.Close) ?>
 
 <?cs call:print_form_header("umount", "volume_mount") ?>
diff --git a/plugins/volume_props/volume_properties.cs b/plugins/volume_props/volume_properties.cs
index 345acd1..0c02b96 100644
--- a/plugins/volume_props/volume_properties.cs
+++ b/plugins/volume_props/volume_properties.cs
@@ -1,6 +1,6 @@
 <?cs # $Id$ ?>
 
-<h2><?cs var:html_escape(Lang.Plugins.volume_props.Title.Properties) ?></h2>
+<!-- <h2><?cs var:html_escape(Lang.Plugins.volume_props.Title.Properties) ?></h2> -->
 
 <?cs call:handle_messages() ?>
 
diff --git a/plugins/volume_props/volume_props.py b/plugins/volume_props/volume_props.py
index e3d63b8..5e36e5a 100644
--- a/plugins/volume_props/volume_props.py
+++ b/plugins/volume_props/volume_props.py
@@ -53,7 +53,8 @@ class volume_props(cryptobox.plugins.base.CryptoBoxPlugin):
 			p.device = self.device
 			plfname = os.path.join(p.plugin_dir, str(p.do_action(**args)) + ".cs")
 			#load_string += "<fieldset><legend><?cs var:html_escape(Lang.Plugins.%s.Link) ?></legend><?cs include:'%s' ?></fieldset>" \
-			load_string += "<fieldset><?cs include:'%s' ?></fieldset>" \
+			#load_string += "<fieldset><?cs include:'%s' ?></fieldset>" \
+			load_string += "<?cs include:'%s' ?>" \
 					%  plfname
 		## this is a little bit ugly: as it is not possible, to load cs files via
 		## 'linclude' (see clearsilver doc) if they use previously defined macros
diff --git a/plugins/volume_rename/language.hdf b/plugins/volume_rename/language.hdf
index 5c15758..2d117bd 100644
--- a/plugins/volume_rename/language.hdf
+++ b/plugins/volume_rename/language.hdf
@@ -2,7 +2,7 @@ Name	= Rename volume
 Link	= Rename
 
 Title {
-	ChangeVolumeName	= Change the name of this volume
+	ChangeVolumeName	= Rename
 }
 
 
diff --git a/plugins/volume_rename/volume_rename.cs b/plugins/volume_rename/volume_rename.cs
index c0f9600..f538b14 100644
--- a/plugins/volume_rename/volume_rename.cs
+++ b/plugins/volume_rename/volume_rename.cs
@@ -1,9 +1,10 @@
-<?cs # $Id$ ?>
-
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_rename.Title.ChangeVolumeName) ?></<?cs var:plugin_heading ?>>
+<!-- <?cs # $Id$ ?> <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_rename.Title.ChangeVolumeName) ?></<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_rename.Title.ChangeVolumeName) ?> </legend>
+
 <?cs call:show_help(Lang.Plugins.volume_rename.Help.Rename) ?>
 
 <?cs if:Data.CurrentDisk.active ?>
@@ -27,4 +28,5 @@
 		</table>
 	</form>
 <?cs /if ?>
+</fieldset>