diff --git a/www/tape/PoolConfig.js b/www/tape/PoolConfig.js
index 6c4e8732..cb2b9a05 100644
--- a/www/tape/PoolConfig.js
+++ b/www/tape/PoolConfig.js
@@ -1,6 +1,15 @@
 Ext.define('pbs-model-media-pool', {
     extend: 'Ext.data.Model',
-    fields: ['name', 'allocation', 'retention', 'template', 'encrypt'],
+    fields: [
+	'name', 'allocation', 'retention', 'template', 'encrypt', 'comment',
+	{
+	    name: 'encryption',
+	    type: 'bool',
+	    calculate: function(data) {
+		return !!data.encrypt;
+	    },
+	},
+    ],
     idProperty: 'name',
 });
 
@@ -102,18 +111,26 @@ Ext.define('PBS.TapeManagement.PoolPanel', {
 	{
 	    text: gettext('Allocation'),
 	    dataIndex: 'allocation',
-	    flex: 1,
 	},
 	{
 	    text: gettext('Retention'),
 	    dataIndex: 'retention',
-	    flex: 1,
+	},
+	{
+	    text: gettext('Encryption'),
+	    dataIndex: 'encryption',
+	    renderer: Proxmox.Utils.format_boolean,
 	},
 	{
 	    text: gettext('Encryption Fingerprint'),
 	    dataIndex: 'encrypt',
+	    hidden: true,
+	    flex: 3,
+	},
+	{
+	    text: gettext('Comment'),
+	    dataIndex: 'comment',
 	    flex: 3,
 	},
     ],
 });
-
diff --git a/www/tape/window/PoolEdit.js b/www/tape/window/PoolEdit.js
index 6f91d25e..d986f540 100644
--- a/www/tape/window/PoolEdit.js
+++ b/www/tape/window/PoolEdit.js
@@ -19,50 +19,66 @@ Ext.define('PBS.TapeManagement.PoolEditWindow', {
 	return { };
     },
 
-    items: [
-	{
-	    fieldLabel: gettext('Name'),
-	    name: 'name',
-	    xtype: 'pmxDisplayEditField',
-	    renderer: Ext.htmlEncode,
-	    allowBlank: false,
-	    cbind: {
-		editable: '{isCreate}',
+    items: {
+	xtype: 'inputpanel',
+	column1: [
+	    {
+		fieldLabel: gettext('Name'),
+		name: 'name',
+		xtype: 'pmxDisplayEditField',
+		renderer: Ext.htmlEncode,
+		allowBlank: false,
+		cbind: {
+		    editable: '{isCreate}',
+		},
 	    },
-	},
-	{
-	    fieldLabel: gettext('Allocation'),
-	    xtype: 'pbsAllocationSelector',
-	    name: 'allocation',
-	    skipEmptyText: true,
-	    allowBlank: true,
-	    autoSelect: false,
-	    cbind: {
-		deleteEmpty: '{!isCreate}',
+	    {
+		fieldLabel: gettext('Allocation'),
+		xtype: 'pbsAllocationSelector',
+		name: 'allocation',
+		skipEmptyText: true,
+		allowBlank: true,
+		autoSelect: false,
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
 	    },
-	},
-	{
-	    fieldLabel: gettext('Retention'),
-	    xtype: 'pbsRetentionSelector',
-	    name: 'retention',
-	    skipEmptyText: true,
-	    allowBlank: true,
-	    autoSelect: false,
-	    cbind: {
-		deleteEmpty: '{!isCreate}',
+	    {
+		fieldLabel: gettext('Retention'),
+		xtype: 'pbsRetentionSelector',
+		name: 'retention',
+		skipEmptyText: true,
+		allowBlank: true,
+		autoSelect: false,
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
 	    },
-	},
-	{
-	    fieldLabel: gettext('Encryption Key'),
-	    xtype: 'pbsTapeKeySelector',
-	    name: 'encrypt',
-	    allowBlank: true,
-	    skipEmptyText: true,
-	    autoSelect: false,
-	    cbind: {
-		deleteEmpty: '{!isCreate}',
-	    },
-	},
-    ],
-});
+	],
 
+	column2: [
+	    {
+		fieldLabel: gettext('Encryption Key'),
+		xtype: 'pbsTapeKeySelector',
+		name: 'encrypt',
+		allowBlank: true,
+		skipEmptyText: true,
+		autoSelect: false,
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
+	    },
+	],
+
+	columnB: [
+	    {
+		fieldLabel: gettext('Comment'),
+		xtype: 'proxmoxtextfield',
+		name: 'comment',
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
+	    },
+	],
+    },
+});