Index: typo3/stylesheet.css
===================================================================
--- typo3/stylesheet.css	(revision 3517)
+++ typo3/stylesheet.css	(working copy)
@@ -1278,7 +1278,17 @@
 	line-height: 27px;
 	border-bottom: 1px solid #000;
 }
-
+div.docheader-row2-left {
+	margin-top: -3px;
+}
+div.docheader-row2-left div.docheader-funcmenu {
+	padding-right: 4px;
+	float: left;
+}
+div.docheader-row2-left div.docheader-csh {
+	padding-top: 3px;
+	float: left;
+}
 div#typo3-docheader div.buttonsleft {
 	margin: 0 0 0 3px;
 	line-height: 16px;
@@ -1312,12 +1322,12 @@
 	margin: 1px 0 0;
 }
 
-div#typo3-docheader div.pagepath {
+div#typo3-docheader div.docheader-row2-left {
 	margin-left: 6px;
 	float: left;
 }
 
-div#typo3-docheader div.infooptions {
+div#typo3-docheader div.docheader-row2-right {
 	margin-right: 6px;
 	float: right;
 }
@@ -2604,3 +2614,4 @@
 */
 
 
+
Index: typo3/templates/alt_doc.html
===================================================================
--- typo3/templates/alt_doc.html	(revision 3517)
+++ typo3/templates/alt_doc.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###LANGSELECTOR######PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###LANGSELECTOR###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -37,4 +37,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###SHORTCUT######COLUMNS_ONLY######OPEN_IN_NEW_WINDOW###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/belog.html
===================================================================
--- typo3/templates/belog.html	(revision 3517)
+++ typo3/templates/belog.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -26,4 +26,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/beuser.html
===================================================================
--- typo3/templates/beuser.html	(revision 3517)
+++ typo3/templates/beuser.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/config.html
===================================================================
--- typo3/templates/config.html	(revision 3517)
+++ typo3/templates/config.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/db_layout.html
===================================================================
--- typo3/templates/db_layout.html	(revision 3517)
+++ typo3/templates/db_layout.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######TOP_FUNCTION_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###LANGSELECTOR######PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###TOP_FUNCTION_MENU###</div><div class="docheader-funcmenu">###LANGSELECTOR###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -31,4 +31,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######CACHE######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/db_layout_quickedit.html
===================================================================
--- typo3/templates/db_layout_quickedit.html	(revision 3517)
+++ typo3/templates/db_layout_quickedit.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######TOP_FUNCTION_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###LANGSELECTOR######PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###TOP_FUNCTION_MENU###</div><div class="docheader-funcmenu">###LANGSELECTOR###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -35,4 +35,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/db_list.html
===================================================================
--- typo3/templates/db_list.html	(revision 3517)
+++ typo3/templates/db_list.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -32,4 +32,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###CACHE######RELOAD######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/db_new.html
===================================================================
--- typo3/templates/db_new.html	(revision 3517)
+++ typo3/templates/db_new.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/db_new_content_el.html
===================================================================
--- typo3/templates/db_new_content_el.html	(revision 3517)
+++ typo3/templates/db_new_content_el.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/dbint.html
===================================================================
--- typo3/templates/dbint.html	(revision 3517)
+++ typo3/templates/dbint.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/em_index.html
===================================================================
--- typo3/templates/em_index.html	(revision 3517)
+++ typo3/templates/em_index.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/file_edit.html
===================================================================
--- typo3/templates/file_edit.html	(revision 3517)
+++ typo3/templates/file_edit.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH###&nbsp;###PATH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PATH###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/file_list.html
===================================================================
--- typo3/templates/file_list.html	(revision 3517)
+++ typo3/templates/file_list.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######TITLE###</div>
-			<div class="infooptions">###FOLDER_INFO###&nbsp;###PAGE_ICON###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###TITLE######FOLDER_INFO###&nbsp;###PAGE_ICON###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###REFRESH######LEVEL_UP######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/file_newfolder.html
===================================================================
--- typo3/templates/file_newfolder.html	(revision 3517)
+++ typo3/templates/file_newfolder.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###PATH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PATH###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/file_rename.html
===================================================================
--- typo3/templates/file_rename.html	(revision 3517)
+++ typo3/templates/file_rename.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH###&nbsp;###PATH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PATH###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/file_upload.html
===================================================================
--- typo3/templates/file_upload.html	(revision 3517)
+++ typo3/templates/file_upload.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###PATH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PATH###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/func.html
===================================================================
--- typo3/templates/func.html	(revision 3517)
+++ typo3/templates/func.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/info.html
===================================================================
--- typo3/templates/info.html	(revision 3517)
+++ typo3/templates/info.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/move_el.html
===================================================================
--- typo3/templates/move_el.html	(revision 3517)
+++ typo3/templates/move_el.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/perm.html
===================================================================
--- typo3/templates/perm.html	(revision 3517)
+++ typo3/templates/perm.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/setup.html
===================================================================
--- typo3/templates/setup.html	(revision 3517)
+++ typo3/templates/setup.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/show_rechis.html
===================================================================
--- typo3/templates/show_rechis.html	(revision 3517)
+++ typo3/templates/show_rechis.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH###</div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/tsconfig_help.html
===================================================================
--- typo3/templates/tsconfig_help.html	(revision 3517)
+++ typo3/templates/tsconfig_help.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
Index: typo3/templates/tstemplate.html
===================================================================
--- typo3/templates/tstemplate.html	(revision 3517)
+++ typo3/templates/tstemplate.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -33,4 +33,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/version.html
===================================================================
--- typo3/templates/version.html	(revision 3517)
+++ typo3/templates/version.html	(working copy)
@@ -4,11 +4,11 @@
 	<div id="typo3-docheader">
 		<div id="typo3-docheader-row1">
 			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-			<div class="buttonsright">###BUTTONLIST_RIGHT######WS_MENU######FUNC_MENU###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###CSH######PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###WS_MENU###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### -->###RECORD_LIST######SHORTCUT###<!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/ws.html
===================================================================
--- typo3/templates/ws.html	(revision 3517)
+++ typo3/templates/ws.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath"></div>
-			<div class="infooptions"></div>
+			<div class="docheader-row2-left"></div>
+			<div class="docheader-row2-right"></div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -30,4 +30,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: typo3/templates/ws_forms.html
===================================================================
--- typo3/templates/ws_forms.html	(revision 3517)
+++ typo3/templates/ws_forms.html	(working copy)
@@ -7,8 +7,8 @@
 			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
 		</div>
 		<div id="typo3-docheader-row2">
-			<div class="pagepath">###PAGEPATH###</div>
-			<div class="infooptions">###PAGEINFO###</div>
+			<div class="docheader-row2-left"></div>
+			<div class="docheader-row2-right">###PAGEPATH######PAGEINFO###</div>
 		</div>
 	</div>
 	<!-- Content of module, for instance listing, info or editing -->
@@ -31,4 +31,4 @@
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
 <!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
-<!-- ###BUTTON_GROUPS_RIGHT### -->
\ No newline at end of file
+<!-- ###BUTTON_GROUPS_RIGHT### -->