diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
index 71dd0647c3a6..c0c61b0b154e 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
@@ -3,7 +3,7 @@
     'ctrl' => [
         'label' => 'title',
         'tstamp' => 'tstamp',
-        'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace',
+        'title' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace',
         'descriptionColumn' => 'description',
         'adminOnly' => true,
         'rootLevel' => 1,
@@ -32,7 +32,7 @@
             ]
         ],
         'adminusers' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.adminusers',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.adminusers',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -44,7 +44,7 @@
             ]
         ],
         'members' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.members',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.members',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -72,14 +72,14 @@
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
                 'foreign_table' => 'sys_filemounts',
-                'foreign_table_where' => ' AND sys_filemounts.pid=0 ORDER BY sys_filemounts.title',
+                'foreign_table_where' => ' ORDER BY sys_filemounts.title',
                 'size' => 3,
                 'maxitems' => 25,
                 'autoSizeMax' => 10,
             ]
         ],
         'publish_time' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.publish_time',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_time',
             'config' => [
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
@@ -88,7 +88,7 @@
             ]
         ],
         'unpublish_time' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.unpublish_time',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.unpublish_time',
             'config' => [
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
@@ -100,7 +100,7 @@
             ],
         ],
         'freeze' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.freeze',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.freeze',
             'config' => [
                 'type' => 'check',
                 'renderType' => 'checkboxToggle',
@@ -114,7 +114,7 @@
             ]
         ],
         'live_edit' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.live_edit',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.live_edit',
             'config' => [
                 'type' => 'check',
                 'renderType' => 'checkboxToggle',
@@ -128,36 +128,37 @@
             ]
         ],
         'swap_modes' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.swap_modes',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.swap_modes',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
+                'default' => 2,
                 'items' => [
-                    ['', 0],
-                    ['Swap-Into-Workspace on Auto-publish', 1],
-                    ['Disable Swap-Into-Workspace', 2]
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.swap_modes.0', 0],
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.swap_modes.1', 1],
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.swap_modes.2', 2],
                 ]
             ]
         ],
         'publish_access' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.publish_access',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_access',
             'config' => [
                 'type' => 'check',
                 'items' => [
-                    ['Publish only content in publish stage', 0],
-                    ['Only workspace owner can publish', 0]
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_access.1', 0],
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_access.2', 0]
                 ]
             ]
         ],
         'stagechg_notification' => [
-            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_workspace.stagechg_notification',
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.stagechg_notification',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['', 0],
-                    ['Notify users on next stage only', 1],
-                    ['Notify all users on any change', 10]
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.stagechg_notification.0', 0],
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.stagechg_notification.1', 1],
+                    ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.stagechg_notification.10', 10]
                 ]
             ]
         ],
@@ -196,7 +197,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.settingsDialog.changeablePreselection', ''],
                 ],
                 'default' => 3,
-                'cols' => 2,
+                'cols' => 1,
             ]
         ],
         'edit_notification_preselection' => [
@@ -209,7 +210,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.preselection.editors', ''],
                 ],
                 'default' => 2,
-                'cols' => 3,
+                'cols' => 1,
             ]
         ],
         'publish_notification_defaults' => [
@@ -234,7 +235,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.settingsDialog.changeablePreselection', ''],
                 ],
                 'default' => 3,
-                'cols' => 2,
+                'cols' => 1,
             ]
         ],
         'publish_notification_preselection' => [
@@ -247,7 +248,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.preselection.editors', ''],
                 ],
                 'default' => 1,
-                'cols' => 3,
+                'cols' => 1,
             ]
         ],
         'execute_notification_defaults' => [
@@ -272,7 +273,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.settingsDialog.changeablePreselection', ''],
                 ],
                 'default' => 3,
-                'cols' => 2,
+                'cols' => 1,
             ]
         ],
         'execute_notification_preselection' => [
@@ -285,11 +286,18 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.preselection.editors', ''],
                 ],
                 'default' => 3,
-                'cols' => 3,
+                'cols' => 1,
             ]
         ]
     ],
     'palettes' => [
+        'main' => [
+            'showitem' => 'title,freeze'
+        ],
+        'memberlist' => [
+            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.users',
+            'showitem' => 'adminusers,members'
+        ],
         'stage.edit' => [
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.palette.stage.edit',
             'showitem' => 'edit_allow_notificaton_settings, edit_notification_preselection,',
@@ -306,22 +314,20 @@
     'types' => [
         '0' => ['showitem' => '
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
-                title,
-            --div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.users,
-                adminusers,members,
-            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.notification_settings,
+                --palette--;;main,
                 stagechg_notification,
+                --palette--;;memberlist,
+            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.internal_stages,
+            --palette--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.notification_settings,
                 --palette--;;stage.edit, edit_notification_defaults,
                 --palette--;;stage.publish, publish_notification_defaults,
                 --palette--;;stage.execute, execute_notification_defaults,
-            --div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.mountpoints,
-                db_mountpoints,file_mountpoints,
-            --div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.publishing,
-                publish_time,
-            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_filemounts.tabs.staging,
+            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.custom_stages,
                 custom_stages,
-            --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
-                freeze,live_edit,swap_modes,publish_access,
+            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.mountpoints,
+                db_mountpoints,file_mountpoints,
+            --div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.publish_access,
+                live_edit,swap_modes,publish_access,publish_time,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:notes,
                 description,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
index a8a2424bafa3..da6a53a684af 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
@@ -78,7 +78,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.settingsDialog.changeablePreselection', ''],
                 ],
                 'default' => 3,
-                'cols' => 2,
+                'cols' => 1,
             ]
         ],
         'notification_preselection' => [
@@ -92,7 +92,7 @@
                     ['LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.preselection.responsiblePersons', ''],
                 ],
                 'default' => 8,
-                'cols' => 4,
+                'cols' => 1,
             ]
         ]
     ],
diff --git a/typo3/sysext/workspaces/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/workspaces/Resources/Private/Language/locallang_db.xlf
index 9edbae882c42..ca832aa3a6f8 100644
--- a/typo3/sysext/workspaces/Resources/Private/Language/locallang_db.xlf
+++ b/typo3/sysext/workspaces/Resources/Private/Language/locallang_db.xlf
@@ -3,8 +3,8 @@
 	<file t3:id="1415815019" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="workspaces">
 		<header/>
 		<body>
-			<trans-unit id="sys_filemounts.tabs.staging">
-				<source>Staging</source>
+			<trans-unit id="sys_workspace">
+				<source>Workspace</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.custom_stages">
 				<source>Custom stages</source>
@@ -27,26 +27,20 @@
 			<trans-unit id="tabs.notification_settings">
 				<source>Notification settings</source>
 			</trans-unit>
-			<trans-unit id="sys_workspace.edit_notification_defaults">
-				<source>Edit stage: default notification mail recipients</source>
-			</trans-unit>
-			<trans-unit id="sys_workspace.edit_allow_notificaton_settings">
-				<source>Allow notification settings during stage change back to edit stage</source>
-			</trans-unit>
-			<trans-unit id="sys_workspace.publish_notification_defaults">
-				<source>Ready to publish stage: default notification mail recipients</source>
-			</trans-unit>
-			<trans-unit id="sys_workspace.publish_allow_notificaton_settings">
-				<source>Allow notification settings during stage change to ready to publish</source>
-			</trans-unit>
 			<trans-unit id="tabs.general">
 				<source>General</source>
 			</trans-unit>
-			<trans-unit id="sys_workspace.execute_notification_defaults">
-				<source>Publishing execute stage: default notification mail recipients</source>
+			<trans-unit id="tabs.internal_stages">
+				<source>Internal Stages</source>
+			</trans-unit>
+			<trans-unit id="tabs.custom_stages">
+				<source>Custom Stages</source>
+			</trans-unit>
+			<trans-unit id="tabs.publish_access">
+				<source>Publishing / Access</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace_stage.notification_defaults">
-				<source>Default notification mail recipients</source>
+				<source>Default notification recipients</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace_stage.allow_notificaton_settings">
 				<source>Allow notification settings during stage change</source>
@@ -61,28 +55,88 @@
 				<source>Stage "publishing execute"</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.settingsDialog">
-				<source>Settings dialog</source>
+				<source>Notification dialog settings</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.settingsDialog.showDialog">
-				<source>show dialog</source>
+				<source>Show Dialog</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.settingsDialog.changeablePreselection">
-				<source>changeable preselection</source>
+				<source>Allow to change pre-selection of recipients</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.preselection">
-				<source>Preselection</source>
+				<source>Pre-select recipients</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.preselection.owners">
-				<source>owners</source>
+				<source>Owners</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.preselection.members">
-				<source>members</source>
+				<source>Members</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.preselection.editors">
-				<source>editors</source>
+				<source>Editors</source>
 			</trans-unit>
 			<trans-unit id="sys_workspace.preselection.responsiblePersons">
-				<source>responsible persons</source>
+				<source>Responsible Persons</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.adminusers">
+				<source>Owners</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.members">
+				<source>Members</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.reviewers">
+				<source>Reviewers</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.publish_time">
+				<source>Auto-publish changes on (requires scheduler task)</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.unpublish_time">
+				<source>Un-Publish changes on (requires scheduler task)</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.freeze">
+				<source>Freeze Editing</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.live_edit">
+				<source>Allow "live" editing of records from tables without versioning</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.swap_modes">
+				<source>Swap modes</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.swap_modes.0">
+				<source>Enable Swap-Into-Workspace</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.swap_modes.1">
+				<source>Swap-Into-Workspace on Auto-publish</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.swap_modes.2">
+				<source>Disable Swap-Into-Workspace</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.publish_access">
+				<source>Publish access</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.publish_access.1">
+				<source>Publish only content in publish stage</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.publish_access.2">
+				<source>Restrict publishing to workspace owners</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.stagechg_notification">
+				<source>Notification settings during state change</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.stagechg_notification.0">
+				<source>Disable notifications</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.stagechg_notification.1">
+				<source>Notify users of next stage only</source>
+			</trans-unit>
+			<trans-unit id="sys_workspace.stagechg_notification.10">
+				<source>Notify all users on any change</source>
+			</trans-unit>
+			<trans-unit id="tabs.users">
+				<source>Users</source>
+			</trans-unit>
+			<trans-unit id="tabs.mountpoints">
+				<source>Mountpoints</source>
 			</trans-unit>
 		</body>
 	</file>