diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index 663f3fc283e61c852397cd3add13ada7368ea418..6d5d9d80576a9d967a57aad96531eec8cce6bfa7 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -10,8 +10,11 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Edit</name>
+      <name>PasswordEdit</name>
       <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Password</drawerCaption>
+      <fixedDrawer v="true" />
       <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <isEditable v="true" />
@@ -29,27 +32,55 @@
           <name>d4f20a8d-edf8-468b-870e-43dec3fb6d3b</name>
           <entityField>jPasswordRepeat</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>SearchEdit</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Search</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
         <entityFieldLink>
-          <name>d9a71143-449a-4b39-8e21-c68024fb1d5b</name>
+          <name>d028eaa3-7250-4b9f-be94-4c097b426506</name>
           <entityField>selectionIgnoreCase</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>70a95008-7ecc-4ffb-bcce-cbc4c80e0fb5</name>
+          <name>e632f409-891a-4c02-b077-962d40b657f9</name>
           <entityField>selectionPlaceholder</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>CalendarEdit</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Calendar</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
         <entityFieldLink>
-          <name>5f7214d7-4ccd-4e7e-98e1-f5f9fe362d6e</name>
+          <name>6c58b326-3fe6-4b1d-a6d4-1735861c419a</name>
           <entityField>calMaintimeStart</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>1fb97320-fddf-4ed1-a4f8-428a6a162b36</name>
+          <name>1463dddd-efa6-4fff-bb7e-ee1bc190f077</name>
           <entityField>calMaintimeEnd</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>aecba9f5-0d12-455b-806c-a3a93589ffc1</name>
+          <name>4bb63da1-6a83-4f68-8605-11dd43501b7b</name>
           <entityField>calHourdivider</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <genericViewTemplate>
+      <name>OtherSettings</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Others</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+    </genericViewTemplate>
   </children>
 </neonView>