diff --git a/pythonrewrite/plugins/date/date.py b/pythonrewrite/plugins/date/date.py
index c23aef4..245c6b6 100644
--- a/pythonrewrite/plugins/date/date.py
+++ b/pythonrewrite/plugins/date/date.py
@@ -64,6 +64,6 @@ class date(CryptoBoxPlugin.CryptoBoxPlugin):
 				"plugin",
 				os.path.join(self.pluginDir, "root_action.py"),
 				date])
-		proc.communicate()
+		proc.wait()
 		return proc.returncode == 0
 
diff --git a/pythonrewrite/plugins/date/root_action.py b/pythonrewrite/plugins/date/root_action.py
index 76c360a..609f0c3 100755
--- a/pythonrewrite/plugins/date/root_action.py
+++ b/pythonrewrite/plugins/date/root_action.py
@@ -31,6 +31,6 @@ if __name__ == "__main__":
 		shell = False,
 		stdout = subprocess.PIPE,
 		args = [DATE_BIN, args[0]])
-	proc.communicate()
+	proc.wait()
 	sys.exit(proc.returncode)
 
diff --git a/pythonrewrite/plugins/disks/disks.cs b/pythonrewrite/plugins/disks/disks.cs
index f18f682..8857774 100644
--- a/pythonrewrite/plugins/disks/disks.cs
+++ b/pythonrewrite/plugins/disks/disks.cs
@@ -11,7 +11,7 @@
 <?cs else ?>
 	<?cs # we use "loop" instead of "each" to keep the order of the disks ?>
 	<?cs loop: index = #0, subcount(Data.Disks)-1, #1 ?>
-		<?cs call:show_volume(index) ?>
+		<?cs call:show_volume(Data.Disks[index]) ?>
 	<?cs /loop ?>
 <?cs /if ?>
 
diff --git a/pythonrewrite/plugins/format_fs/plugin_icon.png b/pythonrewrite/plugins/format_fs/plugin_icon.png
new file mode 100644
index 0000000..85f58d3
Binary files /dev/null and b/pythonrewrite/plugins/format_fs/plugin_icon.png differ
diff --git a/pythonrewrite/plugins/network/network.py b/pythonrewrite/plugins/network/network.py
index eddf232..05539b3 100644
--- a/pythonrewrite/plugins/network/network.py
+++ b/pythonrewrite/plugins/network/network.py
@@ -84,7 +84,7 @@ class network(CryptoBoxPlugin.CryptoBoxPlugin):
 			args = [
 				root_action_plug.IFCONFIG_BIN,
 				root_action_plug.IFACE])
-		(output, error) = proc.communicate()
+		proc.wait()
 		if proc.returncode != 0: return (0,0,0,0)
 		## this regex matches the four numbers of the IP
 		match = re.search(u'inet [\w]+:(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\s',output)
@@ -110,7 +110,7 @@ class network(CryptoBoxPlugin.CryptoBoxPlugin):
 					"plugin",
 					os.path.join(self.pluginDir, "root_action.py"),
 					ip])
-			proc.communicate()
+			proc.wait()
 			if proc.returncode != 0:
 				self.cbox.log.warn("failed to change IP address: %s" % ip)
 				self.cbox.log.warn("error output: %s" % str(proc.stderr.read()))
diff --git a/pythonrewrite/plugins/network/root_action.py b/pythonrewrite/plugins/network/root_action.py
index 1ec7ae8..ab28d48 100755
--- a/pythonrewrite/plugins/network/root_action.py
+++ b/pythonrewrite/plugins/network/root_action.py
@@ -36,6 +36,6 @@ if __name__ == "__main__":
 	proc = subprocess.Popen(
 		shell = False,
 		args = [IFCONFIG_BIN, IFACE, args[0]])
-	proc.communicate()
+	proc.wait()
 	sys.exit(proc.returncode)
 
diff --git a/pythonrewrite/plugins/partition/root_action.py b/pythonrewrite/plugins/partition/root_action.py
index 7b360a9..08d900e 100755
--- a/pythonrewrite/plugins/partition/root_action.py
+++ b/pythonrewrite/plugins/partition/root_action.py
@@ -21,7 +21,7 @@ def __partitionDevice(device):
 			SFDISK_BIN,
 			"-uM",
 			device])
-	proc.communicate()
+	proc.wait()
 	return proc.returncode == 0
 
 
@@ -38,7 +38,7 @@ def __formatPartition(device, type):
 				MKFS_BIN,
 				"-t", type,
 				device])
-		proc.communicate()
+		proc.wait()
 		## TODO: very ugly way of communication: it assumes, that failures are fast - success is slow
 		if proc.returncode == 0:
 			time.sleep(1)
@@ -57,7 +57,7 @@ def __labelPartition(device, label):
 			LABEL_BIN,
 			device,
 			label])
-	proc.communicate()
+	proc.wait()
 	return proc.returncode == 0
 
 
diff --git a/pythonrewrite/plugins/partition/set_partitions.cs b/pythonrewrite/plugins/partition/set_partitions.cs
index 81d18d6..c4b66bd 100644
--- a/pythonrewrite/plugins/partition/set_partitions.cs
+++ b/pythonrewrite/plugins/partition/set_partitions.cs
@@ -8,7 +8,7 @@
 
 <div align="center">
 <table class="partition">
-<?cs if:Data.Plugins.partition.availSize > 0 ?>
+<?cs if:(Data.Plugins.partition.availSize > 0) || (subcount(Data.Plugins.partition.Parts) > 0) ?>
 <?cs # no table header if the harddisk is not partitionable (e.g. still active) ?>
 	<tr>
 		<th><?cs var:html_escape(Lang.Plugins.partition.Text.PartNum) ?></th>
diff --git a/pythonrewrite/plugins/shutdown/root_action.py b/pythonrewrite/plugins/shutdown/root_action.py
index ca98a47..de357b7 100755
--- a/pythonrewrite/plugins/shutdown/root_action.py
+++ b/pythonrewrite/plugins/shutdown/root_action.py
@@ -16,7 +16,7 @@ def call_prog(progy):
 	proc = subprocess.Popen(
 		shell = False,
 		args = [progy])
-	proc.communicate()
+	proc.wait()
 	return proc.returncode == 0
 
 
diff --git a/pythonrewrite/plugins/shutdown/shutdown.py b/pythonrewrite/plugins/shutdown/shutdown.py
index 10da029..d083cbf 100644
--- a/pythonrewrite/plugins/shutdown/shutdown.py
+++ b/pythonrewrite/plugins/shutdown/shutdown.py
@@ -46,6 +46,6 @@ class shutdown(CryptoBoxPlugin.CryptoBoxPlugin):
 				"plugin",
 				os.path.join(self.pluginDir, "root_action.py"),
 				action])
-		proc.communicate()
+		proc.wait()
 		return proc.returncode == 0
 
diff --git a/pythonrewrite/plugins/volume_details/plugin_icon.png b/pythonrewrite/plugins/volume_details/plugin_icon.png
new file mode 100644
index 0000000..d15b3b3
Binary files /dev/null and b/pythonrewrite/plugins/volume_details/plugin_icon.png differ
diff --git a/pythonrewrite/plugins/volume_mount/lang/en.hdf b/pythonrewrite/plugins/volume_mount/lang/en.hdf
index 92b71f0..c2805b0 100644
--- a/pythonrewrite/plugins/volume_mount/lang/en.hdf
+++ b/pythonrewrite/plugins/volume_mount/lang/en.hdf
@@ -1,5 +1,5 @@
 Name	= Mount and umount volumes
-Link	= Main
+Link	= Activation
 
 
 Title {
diff --git a/pythonrewrite/plugins/volume_mount/plugin_icon.png b/pythonrewrite/plugins/volume_mount/plugin_icon.png
new file mode 100644
index 0000000..952890b
Binary files /dev/null and b/pythonrewrite/plugins/volume_mount/plugin_icon.png differ
diff --git a/pythonrewrite/plugins/volume_mount/volume_mount.py b/pythonrewrite/plugins/volume_mount/volume_mount.py
index c6c0e6b..4fc3922 100644
--- a/pythonrewrite/plugins/volume_mount/volume_mount.py
+++ b/pythonrewrite/plugins/volume_mount/volume_mount.py
@@ -37,7 +37,7 @@ class volume_mount(CryptoBoxPlugin.CryptoBoxPlugin):
 	def __doMountPlain(self):
 		if self.container.isMounted():
 			self.hdf["Data.Warning"] = "Plugins.volume_mount.IsAlreadyMounted"
-			self.cbox.log.info("the device (%s) is already mounted" % device)
+			self.cbox.log.info("the device (%s) is already mounted" % self.device)
 			return "volume_status"
 		if self.container.getType() != self.container.Types["plain"]:
 			## not a plain container - fail silently
@@ -61,11 +61,11 @@ class volume_mount(CryptoBoxPlugin.CryptoBoxPlugin):
 	def __doMountLuks(self, pw):
 		if self.container.isMounted():
 			self.hdf["Data.Warning"] = "Plugins.volume_mount.IsAlreadyMounted"
-			self.cbox.log.info("the device (%s) is already mounted" % device)
+			self.cbox.log.info("the device (%s) is already mounted" % self.device)
 			return "volume_status"
 		if not pw:
 			self.dataset["Data.Warning"] = "EmptyPassword"
-			self.log.info("no password was supplied for mounting of device: '%s'" % device)
+			self.log.info("no password was supplied for mounting of device: '%s'" % self.device)
 			return "volume_status"
 		if self.container.getType() != self.container.Types["luks"]:
 			## not a luks container - fail silently
diff --git a/pythonrewrite/plugins/volume_props/plugin_icon.png b/pythonrewrite/plugins/volume_props/plugin_icon.png
new file mode 100644
index 0000000..20d6d59
Binary files /dev/null and b/pythonrewrite/plugins/volume_props/plugin_icon.png differ