diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml
index e9ffa6f..dd8e3a5 100644
--- a/tmpl/admin.yaml
+++ b/tmpl/admin.yaml
@@ -45,6 +45,11 @@ features:
     # Allows to change the security groups for each network interface
     # on the VM creation dialog
     secgroups: true
+
+    # True to hide the CPU setting in the VM creation dialog. The CPU setting
+    # will be set to the same value as VCPU, that will still be visible for the
+    # end users
+    instantiate_hide_cpu: false
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings
@@ -88,16 +93,19 @@ tabs:
             - 2         # Name
             - 3         # Group
             - 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
             User.update_password: true
+            User.login_token: true
             User.quotas_dialog: true
             User.groups_dialog: true
             User.chgrp: true
@@ -183,6 +191,7 @@ tabs:
             - 4         # Name
             - 5         # Registration time
             #- 6         # Labels
+            #- 7         # Search data
         actions:
             Template.refresh: true
             Template.create_dialog: true
@@ -223,6 +232,7 @@ tabs:
             - 3         # Group
             - 4         # Name
             #- 5        # Labels
+            #- 6        # Search data
         actions:
             ServiceTemplate.refresh: true
             ServiceTemplate.create_dialog: true
@@ -249,10 +259,12 @@ tabs:
             - 4         # Name
             - 5         # Registration time
             #- 6         # Labels
+            #- 7         # Search data
         actions:
             VirtualRouterTemplate.refresh: true
             VirtualRouterTemplate.create_dialog: true
             VirtualRouterTemplate.update_dialog: true
+            VirtualRouterTemplate.instantiate_dialog: true
             VirtualRouterTemplate.rename: true
             VirtualRouterTemplate.chown: true
             VirtualRouterTemplate.chgrp: true
@@ -304,6 +316,7 @@ tabs:
             - 11      # VNC
             #- 12      # Hidden Template
             #- 13      # Labels
+            #- 14      # Search data
         actions:
             VM.refresh: true
             VM.create_dialog: true
@@ -392,8 +405,10 @@ tabs:
             - 4         # Name
             - 5         # State
             #- 6        # Labels
+            #- 7        # Search data
         actions:
             Service.refresh: true
+            Service.create_dialog: true
             Service.chown: true
             Service.chgrp: true
             Service.chmod: true
@@ -414,6 +429,8 @@ tabs:
             - 2         # Owner
             - 3         # Group
             - 4         # Name
+            #- 5        # Labels
+            #- 6        # Search data
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
@@ -475,6 +492,7 @@ tabs:
             #- 11        # VM MAD
             #- 12        # Last monitored on
             #- 13        # Labels
+            #- 14        # Search data
         actions:
             Host.refresh: true
             Host.create_dialog: true
@@ -524,6 +542,7 @@ tabs:
             - 10        # Type
             - 11        # Status
             #- 12        # Labels
+            #- 13        # Search data
         actions:
             Datastore.refresh: true
             Datastore.create_dialog: true
@@ -558,6 +577,7 @@ tabs:
             - 11        # #VMs
             #- 12       # Target
             #- 13       # Labels
+            #- 14        # Search data
         actions:
             Image.refresh: true
             Image.create_dialog: true
@@ -596,6 +616,7 @@ tabs:
             #- 11        # #VMs
             #- 12       # Target
             #- 13       # Labels
+            #- 14        # Search data
         actions:
             File.refresh: true
             File.create_dialog: true
@@ -623,6 +644,7 @@ tabs:
             - 7         # Driver
             - 8         # Zone
             #- 9        # Labels
+            #- 10        # Search data
         actions:
             MarketPlace.refresh: true
             MarketPlace.create_dialog: true
@@ -652,6 +674,7 @@ tabs:
             - 10        # Marketplace
             - 11         # Zone
             #- 12        # Labels
+            #- 13        # Search data
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
@@ -689,6 +712,7 @@ tabs:
             - 8         # Leases
             #- 9         # VLAN ID
             #- 10         # Labels
+            #- 11        # Search data
         actions:
             Network.refresh: true
             Network.create_dialog: true
@@ -726,6 +750,7 @@ tabs:
             - 3         # Group
             - 4         # Name
             #- 5         # Labels
+            #- 6        # Search data
         actions:
             SecurityGroup.refresh: true
             SecurityGroup.create_dialog: true
@@ -754,11 +779,23 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         actions:
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
             User.quotas_dialog: false
     upgrade-top-tab:
         panel_tabs: