diff --git a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
index f5210fe..8194d64 100644
--- a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
+++ b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
@@ -239,7 +239,7 @@ msgstr ""
 
 #: umc/js/uvmm/types.js:
 msgid "CD/DVD-ROM drive"
-msgstr "CDROM-Laufwerk"
+msgstr "CD/DVD-ROM"
 
 #: umc/js/uvmm/types.js:
 msgid "CDROM drive"
@@ -469,8 +469,8 @@ msgid "Finnish"
 msgstr "Finnisch"
 
 #: umc/js/uvmm/types.js:
-msgid "Floppy drive"
-msgstr "Diskettenlaufwerk"
+msgid "Floppy disk"
+msgstr "Diskette"
 
 #: umc/js/uvmm/DriveWizard.js:
 msgid ""
@@ -534,7 +534,7 @@ msgid "Guest controlled"
 msgstr "Gast-gesteuert"
 
 #: umc/js/uvmm/types.js: umc/js/uvmm/types.js:
-msgid "Hard drive"
+msgid "Hard disk"
 msgstr "Festplatte"
 
 #: umc/js/uvmm/DriveGrid.js:
diff --git a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js
index a901b03..58ff0ae 100644
--- a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js
+++ b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js
@@ -62,19 +62,23 @@ define([
 		constructor: function() {
 			lang.mixin(this, {
 				cacheRowWidgets: false,
+				actionLabel: false,
 				columns: [{
+					width: '14ex',
 					name: 'device',
 					label: _('Type'),
 					formatter: lang.hitch(this, function(dev) {
 						return types.blockDevices[dev] || _('unknown');
 					})
 				}, {
-					name: 'volumeFilename',
-					label: _('Image')
-				}, {
+					width: '8ex',
 					name: 'size',
 					label: _('Size')
 				}, {
+					name: 'volumeFilename',
+					label: _('Image')
+				}, {
+					width: '15ex',
 					name: 'pool',
 					label: _('Pool')
 				}],
diff --git a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js
index 7b04977..77a7ec6 100644
--- a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js
+++ b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js
@@ -54,7 +54,9 @@ define([
 		constructor: function() {
 			lang.mixin(this, {
 				cacheRowWidgets: false,
+				actionLabel: false,
 				columns: [{
+					width: '6ex',
 					name: 'type',
 					label: _('Type'),
 					formatter: lang.hitch(this, function(type) {
@@ -68,15 +70,11 @@ define([
 						return label;
 					})
 				}, {
+					width: '12ex',
 					name: 'source',
 					label: _('Source')
 				}, {
-					name: 'model',
-					label: _('Driver'),
-					formatter: lang.hitch(this, function(model) {
-						return types.interfaceModels[model] || _('unknown');
-					})
-				}, {
+					width: '17ex',
 					name: 'mac_address',
 					label: _('MAC address'),
 					formatter: lang.hitch(this, function(mac) {
@@ -85,6 +83,12 @@ define([
 						}
 						return mac;
 					})
+				}, {
+					name: 'model',
+					label: _('Driver'),
+					formatter: lang.hitch(this, function(model) {
+						return types.interfaceModels[model] || _('unknown');
+					})
 				}],
 				actions: [{
 					name: 'edit',
diff --git a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/types.js b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/types.js
index efc19a0..fee6f90 100644
--- a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/types.js
+++ b/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/types.js
@@ -49,8 +49,8 @@ define([
 			{ id: 'x86_64', label: '64 bit' }
 		],
 		bootDevices: [
-			{ id: 'hd', label: _('Hard drive') },
-			{ id: 'cdrom', label: _( 'CDROM drive' ) },
+			{ id: 'hd', label: _('Hard disk') },
+			{ id: 'cdrom', label: _( 'CD/DVD-ROM' ) },
 			{ id: 'network', label: _( 'Network' ) }
 		],
 		rtcOffset: [
@@ -206,9 +206,9 @@ define([
 			{ id: 'network:default', label: _( 'NAT' ) }
 		],
 		blockDevices: {
-			'cdrom': _( 'CD/DVD-ROM drive' ),
-			'disk': _( 'Hard drive' ),
-			'floppy': _( 'Floppy drive' )
+			'cdrom': _( 'CD/DVD-ROM' ),
+			'disk': _( 'Hard disk' ),
+			'floppy': _( 'Floppy disk' )
 		},
 		blockDevicePath: {
 			disk: '/dev/',