diff --git a/plugins/partition/partition.py b/plugins/partition/partition.py
index 723ad48..4a10189 100644
--- a/plugins/partition/partition.py
+++ b/plugins/partition/partition.py
@@ -147,6 +147,7 @@ class partition(CryptoBoxPlugin.CryptoBoxPlugin):
 				self.cbox.prefs.umountPartition()
 			if not self.__runFDisk(parts):
 				self.hdf["Data.Warning"] = "Plugins.partition.PartitioningFailed"
+				self.cbox.log.warn("partition: failed to partition device: %s" % self.device)
 				return self.__actionAddPartition(args)
 			else:
 				"""
diff --git a/plugins/partition/set_partitions.cs b/plugins/partition/set_partitions.cs
index f2a9db5..32b3421 100644
--- a/plugins/partition/set_partitions.cs
+++ b/plugins/partition/set_partitions.cs
@@ -57,15 +57,6 @@
 
 <?cs if:Data.Plugins.partition.CreateConfigPartition ?><p><?cs var:html_escape(Lang.Plugins.partition.Text.CreateConfigPartition) ?></p><?cs /if ?>
 
-<?cs if:subcount(Data.Plugins.partition.ExistingContainers) ?>
-	<p align="left"><?cs var:html_escape(Lang.Plugins.partition.Text.RemovalContainers) ?>:
-	<ul>
-		<?cs each:item = Data.Plugins.partition.ExistingContainers ?>
-			<li><?cs var:html_escape(item.name) ?> (<?cs var:html_escape(item.size) ?>)</li>
-		<?cs /each ?>
-	</ul></p>
-<?cs /if ?>
-
 <?cs if:subcount(Data.Plugins.partition.Parts) > 0 ?>
 	<?cs call:hint("Plugins.partition.DeviceDataIsLost") ?>
 
@@ -76,3 +67,12 @@
 	</form>
 <?cs /if ?>
 
+<?cs if:subcount(Data.Plugins.partition.ExistingContainers) ?>
+	<p align="left"><?cs var:html_escape(Lang.Plugins.partition.Text.RemovalContainers) ?>:
+	<ul>
+		<?cs each:item = Data.Plugins.partition.ExistingContainers ?>
+			<li><?cs var:html_escape(item.name) ?> (<?cs var:html_escape(item.size) ?>)</li>
+		<?cs /each ?>
+	</ul></p>
+<?cs /if ?>
+