diff --git a/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_celleditor_menuitem.xml b/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_celleditor_menuitem.xml
index e7ce4950..e63cb867 100644
--- a/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_celleditor_menuitem.xml
+++ b/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_celleditor_menuitem.xml
@@ -7,18 +7,18 @@
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.fpichler</creator>
-<author>xwiki:XWiki.fpichler</author>
+<author>xwiki:XWiki.msladek</author>
 <customClass></customClass>
-<contentAuthor>xwiki:XWiki.fpichler</contentAuthor>
+<contentAuthor>xwiki:XWiki.msladek</contentAuthor>
 <creationDate>1295421347000</creationDate>
-<date>1355768543000</date>
-<contentUpdateDate>1355768543000</contentUpdateDate>
+<date>1667872051000</date>
+<contentUpdateDate>1667872051000</contentUpdateDate>
 <version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Imported from XAR</comment>
+<comment>Aus XAR importiert</comment>
 <minorEdit>false</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -33,22 +33,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -61,12 +73,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -103,22 +120,34 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -131,12 +160,17 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -184,22 +218,34 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;</cmi_link>
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -212,12 +258,17 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;</cmi_link>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -260,22 +311,34 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -288,12 +351,17 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -331,22 +399,34 @@ layoutEditor_reorder();##
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -359,12 +439,17 @@ layoutEditor_reorder();##
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -411,22 +496,34 @@ $cmenu_pageLink##
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -439,12 +536,17 @@ $cmenu_pageLink##
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -480,22 +582,34 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -508,12 +622,17 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -528,7 +647,11 @@ window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
 <cmi_link>#if("$!elemId" != '')
 #set($menuItemDoc = $xwiki.getDocument($elemId))
 #set($docFullName = $menuItemDoc.fullName)
+#if("$celementsweb.getVersionMode()" == "celements3")
 #set($cmenu_pageLink = $xwiki.getURL("$docFullName", 'edit', 'tab=3'))
+#else
+#set($cmenu_pageLink = $xwiki.getURL("$docFullName", 'attach'))
+#end
 #set($attachmentDocSpace = $docFullName.substring(0, $docFullName.indexOf('.')))
 #if(!(("$celementsweb.getVersionMode()" == "celements3") &amp;&amp; ("$!context.getXWiki().getWebPreference('cel_centralfilebase', '$attachmentDocSpace', '', $context.getContext())" != '')))
 window.location.href=&amp;quot;${cmenu_pageLink}&amp;quot;##
diff --git a/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_structured_data_editor.xml b/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_structured_data_editor.xml
index f97200a6..2fdde2ca 100644
--- a/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_structured_data_editor.xml
+++ b/celements-layout/web-module/src/main/webapp/docs/celements2web/CelementsContextMenu/cel_cm_structured_data_editor.xml
@@ -7,18 +7,18 @@
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.fpichler</creator>
-<author>xwiki:XWiki.fpichler</author>
+<author>xwiki:XWiki.msladek</author>
 <customClass></customClass>
-<contentAuthor>xwiki:XWiki.fpichler</contentAuthor>
+<contentAuthor>xwiki:XWiki.msladek</contentAuthor>
 <creationDate>1471186214000</creationDate>
-<date>1475166637000</date>
-<contentUpdateDate>1475166637000</contentUpdateDate>
+<date>1667872055000</date>
+<contentUpdateDate>1667872055000</contentUpdateDate>
 <version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Imported from XAR</comment>
+<comment>Aus XAR importiert</comment>
 <minorEdit>false</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -33,22 +33,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -61,12 +73,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -98,22 +115,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -126,12 +155,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -163,22 +197,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -191,12 +237,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -228,22 +279,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -256,12 +319,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -293,22 +361,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -321,12 +401,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
@@ -358,22 +443,34 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <cmi_icon>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_icon</name>
 <number>3</number>
-<prettyName>optional CMItem icon</prettyName>
+<picker>0</picker>
+<prettyName>cmi_icon</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_icon>
 <cmi_link>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
+<editor>---</editor>
 <name>cmi_link</name>
 <number>1</number>
-<prettyName>CMItem Link (velocity code)</prettyName>
+<picker>0</picker>
+<prettyName>cmi_link</prettyName>
 <rows>20</rows>
 <size>80</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </cmi_link>
 <cmi_shortcut>
@@ -386,12 +483,17 @@
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_shortcut>
 <cmi_text>
+<customDisplay></customDisplay>
 <disabled>0</disabled>
 <name>cmi_text</name>
 <number>2</number>
-<prettyName>CMItem Link Name</prettyName>
+<picker>0</picker>
+<prettyName>cmi_text</prettyName>
 <size>30</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </cmi_text>
 </class>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/company.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/company.xml
index d2b6c788..1dd9919c 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/company.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/company.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1699883287000</creationDate>
-<date>1699883573000</date>
+<date>1771342458000</date>
 <contentUpdateDate>1699883496000</contentUpdateDate>
-<version>7.1</version>
+<version>8.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>5</menu_position>
+<menu_position>2</menu_position>
 </property>
 <property>
 <part_name>TableHeader</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/email.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/email.xml
index ff200703..f35a5af6 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/email.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/email.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683703602000</creationDate>
-<date>1686124895000</date>
+<date>1771342459000</date>
 <contentUpdateDate>1683703649000</contentUpdateDate>
-<version>9.1</version>
+<version>10.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>4</menu_position>
+<menu_position>5</menu_position>
 </property>
 <property>
 <part_name>TableHeader</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/language.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/language.xml
index c5304c02..99ec30b8 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/language.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/language.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1699883515000</creationDate>
-<date>1699885016000</date>
-<contentUpdateDate>1699885016000</contentUpdateDate>
-<version>10.1</version>
+<date>1771344506000</date>
+<contentUpdateDate>1771344506000</contentUpdateDate>
+<version>11.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -337,4 +338,4 @@
 <page_type>CelementsCell</page_type>
 </property>
 </object>
-<content>&lt;i class="fa fa-flag" title="cel_useradmin_edit_admin_language"&gt;&lt;/i&gt;</content></xwikidoc>
+<content>&lt;i class="fa fa-flag" title="$adminMsg.get('cel_useradmin_edit_admin_language')"&gt;&lt;/i&gt;</content></xwikidoc>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/name.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/name.xml
index 2ef77183..9bff0ab8 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/name.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/name.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683291613000</creationDate>
-<date>1686124894000</date>
+<date>1771342458000</date>
 <contentUpdateDate>1683703492000</contentUpdateDate>
-<version>11.1</version>
+<version>12.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>2</menu_position>
+<menu_position>3</menu_position>
 </property>
 <property>
 <part_name>TableHeader</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/vorname.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/vorname.xml
index 4f622cb7..dbc881e1 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/vorname.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableHeader/vorname.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683703531000</creationDate>
-<date>1686124895000</date>
+<date>1771342459000</date>
 <contentUpdateDate>1683703560000</contentUpdateDate>
-<version>10.1</version>
+<version>11.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>3</menu_position>
+<menu_position>4</menu_position>
 </property>
 <property>
 <part_name>TableHeader</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/activ.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/activ.xml
index 47e20fcb..4a8f2cd8 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/activ.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/activ.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/company.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/company.xml
index a698b52f..d5e7ec5e 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/company.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/company.xml
@@ -11,14 +11,14 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1684490522000</creationDate>
-<date>1699884154000</date>
+<date>1771342470000</date>
 <contentUpdateDate>1684490613000</contentUpdateDate>
-<version>8.1</version>
+<version>9.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>updateAndSaveDocFormRequest</comment>
+<comment>Restructuring</comment>
 <minorEdit>false</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>5</menu_position>
+<menu_position>2</menu_position>
 </property>
 <property>
 <part_name></part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/delete_action.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/delete_action.xml
index 4a9b34ca..a77e3cd9 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/delete_action.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/delete_action.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1686150155000</creationDate>
-<date>1721316794000</date>
-<contentUpdateDate>1721316794000</contentUpdateDate>
-<version>20.1</version>
+<date>1771507288000</date>
+<contentUpdateDate>1771507288000</contentUpdateDate>
+<version>36.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -275,7 +275,4 @@
 <page_type>CelementsCell</page_type>
 </property>
 </object>
-<content>#set($iconDeleteCssClass = "fa-solid fa-trash-can")
-#set($xredirect = "/app/cel/admin/UserAdmin")
-#set($xcancel = "/app/cel/admin/UserAdmin")
-#parse('celStruct/table/col_delete.vm')</content></xwikidoc>
+<content>#parse('celMacros/userAdmin/col_delete.vm')</content></xwikidoc>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/editContent.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/editContent.xml
index fddbe85e..d1386835 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/editContent.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/editContent.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/email.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/email.xml
index 729d93a4..8cb9c6e9 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/email.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/email.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683704532000</creationDate>
-<date>1686124975000</date>
+<date>1771342471000</date>
 <contentUpdateDate>1683704572000</contentUpdateDate>
-<version>9.1</version>
+<version>10.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>4</menu_position>
+<menu_position>5</menu_position>
 </property>
 <property>
 <part_name>TableRow</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groupLabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groupLabel.xml
index ffaac28f..ef39d156 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groupLabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groupLabel.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groups.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groups.xml
index b36d0eff..f703d179 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groups.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/groups.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/language.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/language.xml
index bb0124ee..d5988165 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/language.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/language.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/name.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/name.xml
index 801199bf..f5302b3b 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/name.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/name.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683704395000</creationDate>
-<date>1686124974000</date>
+<date>1771342470000</date>
 <contentUpdateDate>1683712368000</contentUpdateDate>
-<version>20.1</version>
+<version>21.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>2</menu_position>
+<menu_position>3</menu_position>
 </property>
 <property>
 <part_name>TableRow</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/vorname.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/vorname.xml
index 304cb56c..8d6391b7 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/vorname.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/TableRow/vorname.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683704473000</creationDate>
-<date>1686124974000</date>
+<date>1771342471000</date>
 <contentUpdateDate>1683704510000</contentUpdateDate>
-<version>10.1</version>
+<version>11.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -239,7 +240,7 @@
 <menu_parent></menu_parent>
 </property>
 <property>
-<menu_position>3</menu_position>
+<menu_position>4</menu_position>
 </property>
 <property>
 <part_name>TableRow</part_name>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/Titel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/Titel.xml
index de4d400b..ce90272e 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/Titel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/Titel.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>Titel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdmin.titleWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/WebHome.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/WebHome.xml
index 6fd6f974..2d16e64b 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/WebHome.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/WebHome.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>WebHome</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -11,15 +11,15 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1681291649000</creationDate>
-<date>1716295586000</date>
-<contentUpdateDate>1716295586000</contentUpdateDate>
-<version>143.1</version>
+<date>1771510960000</date>
+<contentUpdateDate>1771510960000</contentUpdateDate>
+<version>144.5</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
 <comment></comment>
-<minorEdit>false</minorEdit>
+<minorEdit>true</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden><attachment>
 <filename>useradmin-table.css</filename>
@@ -366,6 +366,22 @@ ICBib3JkZXI6IG5vbmU7Cn0K
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
 <loadMode>
 <cache>0</cache>
 <disabled>0</disabled>
@@ -391,6 +407,75 @@ ICBib3JkZXI6IG5vbmU7Cn0K
 <filepath>/file/resources/celJS/userAdmin/sendActivationMail.mjs</filepath>
 </property>
 <property>
+<isRteContent>NO</isRteContent>
+</property>
+<property>
+<loadMode>DEFER</loadMode>
+</property>
+</object>
+<object>
+<class>
+<name>JavaScript.ExternalFiles</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<filepath>
+<disabled>0</disabled>
+<name>filepath</name>
+<number>1</number>
+<prettyName>Filepath</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
+<loadMode>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>loadMode</name>
+<number>2</number>
+<prettyName>Load Mode</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>SYNC|DEFER|ASYNC</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</loadMode>
+</class>
+<name>UserAdmin.WebHome</name>
+<number>1</number>
+<className>JavaScript.ExternalFiles</className>
+<guid>88be4f95-2307-4cf6-ad4b-e854714ef8f4</guid>
+<property>
+<filepath>/file/resources/celJS/userAdmin/doubleclickEditAction.mjs</filepath>
+</property>
+<property>
+<isRteContent>NO</isRteContent>
+</property>
+<property>
 <loadMode>DEFER</loadMode>
 </property>
 </object>
@@ -637,7 +722,7 @@ ICBib3JkZXI6IG5vbmU7Cn0K
 <alternate></alternate>
 </property>
 <property>
-<cssname>/file/resources/celRes/userAdmin/dropdownMenu.css</cssname>
+<cssname>/file/resources/celRes/userAdmin/buttonRow.css</cssname>
 </property>
 <property>
 <is_rte_content></is_rte_content>
@@ -807,7 +892,7 @@ ICBib3JkZXI6IG5vbmU7Cn0K
 <alternate></alternate>
 </property>
 <property>
-<cssname>/file/resources/celRes/font%2Dawesome%2D6%2E4/css/all.css?version=20230803</cssname>
+<cssname>/file/resources/celRes/font%2Dawesome%2Dv6/css/all.css?version=20230803</cssname>
 </property>
 <property>
 <is_rte_content></is_rte_content>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/main.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/main.xml
index 121a6066..480268d8 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/main.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/main.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>main</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdmin.page</parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/page.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/page.xml
index 2dc79c0a..f2832c91 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/page.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/page.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>page</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/searchform.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/searchform.xml
index 85769210..075afae4 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/searchform.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/searchform.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>searchform</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdmin.main</parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/subtitleSearch.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/subtitleSearch.xml
index 9d031399..6132b022 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/subtitleSearch.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdmin/subtitleSearch.xml
@@ -3,7 +3,7 @@
 <web>UserAdmin</web>
 <name>subtitleSearch</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdmin.main</parent>
 <creator>xwiki:XWiki.cpichler</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/WebHome.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/WebHome.xml
index c1165f63..1eb1285a 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/WebHome.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/WebHome.xml
@@ -7,18 +7,18 @@
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.cpichler</creator>
-<author>xwiki:XWiki.fpichler</author>
+<author>xwiki:XWiki.cpichler</author>
 <customClass></customClass>
-<contentAuthor>xwiki:XWiki.fpichler</contentAuthor>
+<contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683879125000</creationDate>
-<date>1715074114000</date>
-<contentUpdateDate>1715074114000</contentUpdateDate>
-<version>14.6</version>
+<date>1773071127000</date>
+<contentUpdateDate>1773071127000</contentUpdateDate>
+<version>14.9</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Deleted object</comment>
+<comment>Added object</comment>
 <minorEdit>true</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -157,6 +157,22 @@
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
 <loadMode>
 <cache>0</cache>
 <disabled>0</disabled>
@@ -182,6 +198,9 @@
 <filepath>/file/resources/structEditJS/StructEditor.mjs</filepath>
 </property>
 <property>
+<isRteContent>NO</isRteContent>
+</property>
+<property>
 <loadMode>DEFER</loadMode>
 </property>
 </object>
@@ -204,6 +223,22 @@
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
 <loadMode>
 <cache>0</cache>
 <disabled>0</disabled>
@@ -229,6 +264,9 @@
 <filepath>/file/resources/structEditJS/select2/select2.full.min.js</filepath>
 </property>
 <property>
+<isRteContent>NO</isRteContent>
+</property>
+<property>
 <loadMode>DEFER</loadMode>
 </property>
 </object>
@@ -251,6 +289,22 @@
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
 <loadMode>
 <cache>0</cache>
 <disabled>0</disabled>
@@ -276,6 +330,9 @@
 <filepath>/file/resources/celJS/userAdmin/initSelect2.mjs</filepath>
 </property>
 <property>
+<isRteContent>NO</isRteContent>
+</property>
+<property>
 <loadMode>DEFER</loadMode>
 </property>
 </object>
@@ -522,7 +579,7 @@
 <alternate></alternate>
 </property>
 <property>
-<cssname>/file/resources/celRes/font%2Dawesome%2D6%2E4/css/all.css?version=20230803</cssname>
+<cssname>/file/resources/celRes/font%2Dawesome%2Dv6/css/all.css?version=20230803 </cssname>
 </property>
 <property>
 <is_rte_content></is_rte_content>
@@ -534,4 +591,87 @@
 <title></title>
 </property>
 </object>
+<object>
+<class>
+<name>XWiki.XWikiGlobalRights</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<allow>
+<defaultValue>1</defaultValue>
+<disabled>0</disabled>
+<displayFormType>select</displayFormType>
+<displayType>allow</displayType>
+<name>allow</name>
+<number>4</number>
+<prettyName>Allow/Deny</prettyName>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</allow>
+<groups>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>groups</name>
+<number>1</number>
+<prettyName>Groups</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>5</size>
+<unmodifiable>0</unmodifiable>
+<usesList>1</usesList>
+<classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
+</groups>
+<levels>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>levels</name>
+<number>2</number>
+<prettyName>Levels</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>3</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
+</levels>
+<users>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>users</name>
+<number>3</number>
+<prettyName>Users</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>5</size>
+<unmodifiable>0</unmodifiable>
+<usesList>1</usesList>
+<classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
+</users>
+</class>
+<name>UserAdminEdit.WebHome</name>
+<number>0</number>
+<className>XWiki.XWikiGlobalRights</className>
+<guid>1c4a7c38-14b2-4981-9e2d-128de1dced87</guid>
+<property>
+<allow></allow>
+</property>
+<property>
+<groups></groups>
+</property>
+<property>
+<levels></levels>
+</property>
+<property>
+<users></users>
+</property>
+</object>
 <content></content></xwikidoc>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/main.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/main.xml
index bb7d0279..8bc325b5 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/main.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/main.xml
@@ -11,14 +11,14 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683879445000</creationDate>
-<date>1692943369000</date>
-<contentUpdateDate>1683879451000</contentUpdateDate>
-<version>10.1</version>
+<date>1721123071000</date>
+<contentUpdateDate>1721123071000</contentUpdateDate>
+<version>11.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>updateAndSaveDocFormRequest</comment>
+<comment></comment>
 <minorEdit>false</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -240,6 +240,61 @@
 </object>
 <object>
 <class>
+<name>Celements2.MenuName</name>
+<customClass></customClass>
+<customMapping>internal</customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<image>
+<disabled>0</disabled>
+<name>image</name>
+<number>4</number>
+<prettyName>Background Image</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</image>
+<lang>
+<disabled>0</disabled>
+<name>lang</name>
+<number>2</number>
+<prettyName>Language</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</lang>
+<menu_name>
+<disabled>0</disabled>
+<name>menu_name</name>
+<number>1</number>
+<prettyName>Multilingual MenuName</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</menu_name>
+<tooltip>
+<disabled>0</disabled>
+<name>tooltip</name>
+<number>3</number>
+<prettyName>Tool Tip</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</tooltip>
+</class>
+<name>UserAdminEdit.main</name>
+<number>1</number>
+<className>Celements2.MenuName</className>
+<guid>c2aad48c-681c-444c-b7f5-ac7228d18989</guid>
+<property>
+<lang>de</lang>
+</property>
+</object>
+<object>
+<class>
 <name>Celements2.PageType</name>
 <customClass></customClass>
 <customMapping></customMapping>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/subtitle.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/subtitle.xml
index bfbf8a8e..6d401547 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/subtitle.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/subtitle.xml
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/title.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/title.xml
index 18ca981d..2a0e2d28 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/title.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminEdit/title.xml
@@ -7,13 +7,13 @@
 <translation>0</translation>
 <parent>UserAdminEdit.main</parent>
 <creator>xwiki:XWiki.cpichler</creator>
-<author>xwiki:XWiki.fpichler</author>
+<author>xwiki:XWiki.cpichler</author>
 <customClass></customClass>
-<contentAuthor>xwiki:XWiki.fpichler</contentAuthor>
+<contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683879632000</creationDate>
-<date>1699864198000</date>
-<contentUpdateDate>1699864181000</contentUpdateDate>
-<version>13.1</version>
+<date>1721123168000</date>
+<contentUpdateDate>1721123168000</contentUpdateDate>
+<version>14.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -302,6 +303,61 @@
 </object>
 <object>
 <class>
+<name>Celements2.MenuName</name>
+<customClass></customClass>
+<customMapping>internal</customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<image>
+<disabled>0</disabled>
+<name>image</name>
+<number>4</number>
+<prettyName>Background Image</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</image>
+<lang>
+<disabled>0</disabled>
+<name>lang</name>
+<number>2</number>
+<prettyName>Language</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</lang>
+<menu_name>
+<disabled>0</disabled>
+<name>menu_name</name>
+<number>1</number>
+<prettyName>Multilingual MenuName</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</menu_name>
+<tooltip>
+<disabled>0</disabled>
+<name>tooltip</name>
+<number>3</number>
+<prettyName>Tool Tip</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</tooltip>
+</class>
+<name>UserAdminEdit.title</name>
+<number>1</number>
+<className>Celements2.MenuName</className>
+<guid>85a6d912-96cc-4703-94fa-253b4fafa13c</guid>
+<property>
+<lang>de</lang>
+</property>
+</object>
+<object>
+<class>
 <name>Celements2.PageType</name>
 <customClass></customClass>
 <customMapping></customMapping>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/AjaxMode.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/AjaxMode.xml
index 0afc8757..ae812c5c 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/AjaxMode.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/AjaxMode.xml
@@ -166,6 +166,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/Template.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/Template.xml
index 4d8dcdd3..56313e18 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/Template.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/Template.xml
@@ -166,6 +166,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/WebHome.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/WebHome.xml
index ae080ab4..b42612f2 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/WebHome.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/WebHome.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>WebHome</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -178,6 +178,22 @@ aW46IDZweCAwIDEycHg7Cn0KCg==
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </filepath>
+<isRteContent>
+<cache>0</cache>
+<disabled>0</disabled>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>isRteContent</name>
+<number>3</number>
+<prettyName>Is Rte Content</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators>|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>NO|BOTH|ONLY</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</isRteContent>
 <loadMode>
 <cache>0</cache>
 <disabled>0</disabled>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XPage.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XPage.xml
index f09fd912..e766e7df 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XPage.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XPage.xml
@@ -166,6 +166,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XRedirect.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XRedirect.xml
index 98b280e2..f6b816ba 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XRedirect.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/XRedirect.xml
@@ -166,6 +166,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/acitvelabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/acitvelabel.xml
index 7e7509b3..bef0f7f0 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/acitvelabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/acitvelabel.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>acitvelabel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.activeWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/active.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/active.xml
index 1feb9e7a..5816de82 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/active.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/active.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>active</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.activeWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -123,6 +123,7 @@
 <select_tag_is_bootstrap>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_bootstrap</name>
 <number>2</number>
 <prettyName>Is Bootstrap</prettyName>
@@ -132,6 +133,7 @@
 <select_tag_is_multiselect>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_multiselect</name>
 <number>3</number>
 <prettyName>Is Multiselect</prettyName>
@@ -200,6 +202,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/company.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/company.xml
index eee4a2da..cda857ec 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/company.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/company.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>company</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.personalien</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/createIfNotExists.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/createIfNotExists.xml
index a21e37eb..819f1b7e 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/createIfNotExists.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/createIfNotExists.xml
@@ -166,6 +166,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/email.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/email.xml
index 548c11ba..4816bead 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/email.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/email.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>email</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.personalien</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/form.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/form.xml
index 69c13682..dddb4c76 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/form.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/form.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>form</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -147,6 +147,7 @@
 <form_field_send_data_encoded>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>form_field_send_data_encoded</name>
 <number>3</number>
 <prettyName>Send Data Encoded</prettyName>
@@ -209,6 +210,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/lang.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/lang.xml
index 7a810849..c3c2174d 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/lang.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/lang.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>lang</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.languageWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -123,6 +123,7 @@
 <select_tag_is_bootstrap>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_bootstrap</name>
 <number>2</number>
 <prettyName>Is Bootstrap</prettyName>
@@ -132,6 +133,7 @@
 <select_tag_is_multiselect>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_multiselect</name>
 <number>3</number>
 <prettyName>Is Multiselect</prettyName>
@@ -200,6 +202,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/langlabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/langlabel.xml
index 916dc7b2..9d88e182 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/langlabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/langlabel.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>langlabel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.languageWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/nachname.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/nachname.xml
index 88092517..2acd3246 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/nachname.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/nachname.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>nachname</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.personalien</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/otpions.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/otpions.xml
index cc9502f1..2be16079 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/otpions.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/otpions.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>otpions</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.wrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/password.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/password.xml
index 9fec9ece..f2eb2c3f 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/password.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/password.xml
@@ -182,6 +182,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/passwordLabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/passwordLabel.xml
index 82ce8717..a942369b 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/passwordLabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/passwordLabel.xml
@@ -63,6 +63,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/personalien.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/personalien.xml
index 6a877bba..1234427a 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/personalien.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/personalien.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>personalien</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.wrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdreset.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdreset.xml
index fc74d842..613caf28 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdreset.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdreset.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>pwdreset</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.pwdResetWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -123,6 +123,7 @@
 <select_tag_is_bootstrap>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_bootstrap</name>
 <number>2</number>
 <prettyName>Is Bootstrap</prettyName>
@@ -132,6 +133,7 @@
 <select_tag_is_multiselect>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_multiselect</name>
 <number>3</number>
 <prettyName>Is Multiselect</prettyName>
@@ -200,6 +202,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdresetlabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdresetlabel.xml
index 3f5ec230..30466343 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdresetlabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/pwdresetlabel.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>pwdresetlabel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.pwdResetWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roles.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roles.xml
index 7ee5fd38..f66fa9bc 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roles.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roles.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>roles</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.roleWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -123,6 +123,7 @@
 <select_tag_is_bootstrap>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_bootstrap</name>
 <number>2</number>
 <prettyName>Is Bootstrap</prettyName>
@@ -132,6 +133,7 @@
 <select_tag_is_multiselect>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_multiselect</name>
 <number>3</number>
 <prettyName>Is Multiselect</prettyName>
@@ -203,6 +205,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roleslabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roleslabel.xml
index ae340721..84c1b2c1 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roleslabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/roleslabel.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>roleslabel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.roleWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -126,6 +126,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/submit.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/submit.xml
index 59a726da..1d0c10a2 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/submit.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/submit.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>submit</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.formActionWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/suspended.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/suspended.xml
index 02482cf3..ab6346f0 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/suspended.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/suspended.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>suspended</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.suspendedWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -123,6 +123,7 @@
 <select_tag_is_bootstrap>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_bootstrap</name>
 <number>2</number>
 <prettyName>Is Bootstrap</prettyName>
@@ -132,6 +133,7 @@
 <select_tag_is_multiselect>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>select_tag_is_multiselect</name>
 <number>3</number>
 <prettyName>Is Multiselect</prettyName>
@@ -200,6 +202,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/susplabel.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/susplabel.xml
index dc3a81b9..dfff5496 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/susplabel.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/susplabel.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>susplabel</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.suspendedWrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/vorname.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/vorname.xml
index 006bc434..9b600a8d 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/vorname.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/vorname.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>vorname</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.personalien</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -182,6 +182,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/wrapper.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/wrapper.xml
index 39fcd815..0f5812eb 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/wrapper.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminForm/wrapper.xml
@@ -3,7 +3,7 @@
 <web>UserAdminForm</web>
 <name>wrapper</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminForm.form</parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/WebHome.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/WebHome.xml
index 9dd80d94..d9deb754 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/WebHome.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/WebHome.xml
@@ -3,7 +3,7 @@
 <web>UserAdminSearch</web>
 <name>WebHome</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/adduser.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/adduser.xml
index 00c80e23..363154f3 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/adduser.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/adduser.xml
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683729906000</creationDate>
-<date>1723012589000</date>
-<contentUpdateDate>1723012589000</contentUpdateDate>
-<version>33.1</version>
+<date>1771344112000</date>
+<contentUpdateDate>1771344112000</contentUpdateDate>
+<version>37.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -182,6 +182,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -378,6 +379,9 @@
 <page_type>CelementsCell</page_type>
 </property>
 </object>
-<content>&lt;a href="/UserAdmin?xpage=celements_ajax&amp;ajax_mode=redirectToNextDocRef&amp;namingMode=random&amp;pageType=User&amp;lengthOfRandomAlphanumeric=12&amp;prefix=&amp;xredirect=/app/cel/admin/UserAdmin"&gt;
+<content>#if($isAdmin)
+&lt;a href="/UserAdmin?xpage=celements_ajax&amp;ajax_mode=redirectToNextDocRef&amp;namingMode=random&amp;pageType=User&amp;lengthOfRandomAlphanumeric=12&amp;prefix=&amp;xredirect=/app/cel/admin/UserAdmin"&gt;
+  &lt;span&gt;$adminMsg.get('cel_add_user')&lt;/span&gt;
   &lt;i class="fa-solid fa-plus"&gt;&lt;/i&gt;
-&lt;/a&gt;</content></xwikidoc>
+&lt;/a&gt;
+#end</content></xwikidoc>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/form.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/form.xml
index c1ed9a1e..6ee690df 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/form.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/form.xml
@@ -3,22 +3,22 @@
 <web>UserAdminSearch</web>
 <name>form</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
 <author>xwiki:XWiki.cpichler</author>
 <customClass></customClass>
-<contentAuthor>xwiki:XWiki.msladek</contentAuthor>
+<contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1681979974000</creationDate>
-<date>1700042820000</date>
-<contentUpdateDate>1682675921000</contentUpdateDate>
-<version>9.1</version>
+<date>1771343354000</date>
+<contentUpdateDate>1771343354000</contentUpdateDate>
+<version>10.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>updateAndSaveDocFormRequest</comment>
+<comment></comment>
 <minorEdit>false</minorEdit>
 <syntaxId>xwiki/1.0</syntaxId>
 <hidden>false</hidden>
@@ -147,6 +147,7 @@
 <form_field_send_data_encoded>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>form_field_send_data_encoded</name>
 <number>3</number>
 <prettyName>Send Data Encoded</prettyName>
@@ -209,6 +210,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -364,6 +366,61 @@
 </object>
 <object>
 <class>
+<name>Celements2.MenuName</name>
+<customClass></customClass>
+<customMapping>internal</customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<image>
+<disabled>0</disabled>
+<name>image</name>
+<number>4</number>
+<prettyName>Background Image</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</image>
+<lang>
+<disabled>0</disabled>
+<name>lang</name>
+<number>2</number>
+<prettyName>Language</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</lang>
+<menu_name>
+<disabled>0</disabled>
+<name>menu_name</name>
+<number>1</number>
+<prettyName>Multilingual MenuName</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</menu_name>
+<tooltip>
+<disabled>0</disabled>
+<name>tooltip</name>
+<number>3</number>
+<prettyName>Tool Tip</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</tooltip>
+</class>
+<name>UserAdminSearch.form</name>
+<number>1</number>
+<className>Celements2.MenuName</className>
+<guid>ab6a21be-87d3-4725-80bc-9faa465be5c2</guid>
+<property>
+<lang>en</lang>
+</property>
+</object>
+<object>
+<class>
 <name>Celements2.PageType</name>
 <customClass></customClass>
 <customMapping></customMapping>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/search.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/search.xml
index f4ed3f89..306493a9 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/search.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/search.xml
@@ -3,7 +3,7 @@
 <web>UserAdminSearch</web>
 <name>search</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent>UserAdminSearch.searchwrapper</parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -182,6 +182,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/table.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/table.xml
index 05de5294..67d8f4a9 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/table.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/table.xml
@@ -3,7 +3,7 @@
 <web>UserAdminSearch</web>
 <name>table</name>
 <language></language>
-<defaultLanguage>en</defaultLanguage>
+<defaultLanguage>de</defaultLanguage>
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.msladek</creator>
@@ -11,9 +11,9 @@
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1681980200000</creationDate>
-<date>1715096089000</date>
+<date>1771512053000</date>
 <contentUpdateDate>1683269180000</contentUpdateDate>
-<version>30.1</version>
+<version>42.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -141,6 +141,7 @@
 <multilingual>
 <disabled>0</disabled>
 <displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
 <name>multilingual</name>
 <number>3</number>
 <prettyName>Multilingual</prettyName>
@@ -291,7 +292,11 @@
 <row_layout>TableRow</row_layout>
 </property>
 <property>
-<sort_fields/>
+<sort_fields>
+<value>XWiki.XWikiUsers.company</value>
+<value>XWiki.XWikiUsers.last_name</value>
+<value>XWiki.XWikiUsers.first_name</value>
+</sort_fields>
 </property>
 <property>
 <type>DOC</type>
diff --git a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/userAdminActionButtonWrapper.xml b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/userAdminActionButtonWrapper.xml
index c0f8f957..3068a939 100644
--- a/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/userAdminActionButtonWrapper.xml
+++ b/celements-user-manager/web-module/src/main/webapp/docs/celements2web/UserAdminSearch/userAdminActionButtonWrapper.xml
@@ -7,13 +7,13 @@
 <translation>0</translation>
 <parent></parent>
 <creator>xwiki:XWiki.cpichler</creator>
-<author>xwiki:XWiki.cpichler</author>
+<author>xwiki:XWiki.fpichler</author>
 <customClass></customClass>
 <contentAuthor>xwiki:XWiki.cpichler</contentAuthor>
 <creationDate>1683729613000</creationDate>
-<date>1722006509000</date>
+<date>1755174273000</date>
 <contentUpdateDate>1709548505000</contentUpdateDate>
-<version>9.1</version>
+<version>10.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -352,7 +352,7 @@
 <groups>XWiki.XWikiAdminGroup</groups>
 </property>
 <property>
-<levels>view,edit,delete,undelete</levels>
+<levels></levels>
 </property>
 </object>
 <content></content></xwikidoc>