diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 281cbfa59e..66aa3c7693 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -77,7 +77,7 @@ tabs:
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
-            User.chauth: true
+            User.change_authentication: true
             User.delete: true
     groups-tab:
         panel_tabs:
@@ -98,6 +98,7 @@ tabs:
         actions:
             Group.refresh: true
             Group.create_dialog: true
+            Group.update_dialog: true
             Group.quotas_dialog: true
             Group.delete: true
             Group.edit_admins: true
@@ -207,6 +208,7 @@ tabs:
             VM.disk_snapshot_delete: true
             VM.resched: true
             VM.unresched: true
+            VM.saveas_template: true
     templates-tab:
         panel_tabs:
             template_info_tab: true
@@ -397,7 +399,9 @@ tabs:
         panel_tabs:
         actions:
             NetworkTopology.refresh: true
-            NetworkTopology.toggleVMs: true
+            NetworkTopology.fit: true
+            NetworkTopology.collapseVMs: true
+            NetworkTopology.openVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: true
@@ -422,6 +426,7 @@ tabs:
             Network.create_dialog: true
             Network.import_dialog: false
             Network.update_dialog: true
+            Network.reserve_dialog: true
             Network.addtocluster: true
             Network.rename: true
             Network.chown: true
@@ -494,6 +499,8 @@ tabs:
                 Role.reboot_hard: true
                 Role.poweroff: true
                 Role.poweroff_hard: true
+                Role.undeploy: true
+                Role.undeploy_hard: true
                 Role.shutdown: true
                 Role.shutdown_hard: true
                 Role.delete: true
@@ -545,12 +552,13 @@ tabs:
         actions:
             ServiceTemplate.refresh: true
             ServiceTemplate.create_dialog: true
+            ServiceTemplate.update_dialog: true
             ServiceTemplate.instantiate: true
             ServiceTemplate.chown: true
             ServiceTemplate.chgrp: true
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
-            ServiceTemplate.clone: true
+            ServiceTemplate.clone_dialog: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index cfd5b7842c..da38d4e590 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -16,6 +16,7 @@ enabled_tabs:
     - clusters-tab
     - hosts-tab
     #- datastores-tab
+    - vnets-topology-tab
     - vnets-tab
     #- secgroups-tab
     - vrouters-tab
@@ -74,7 +75,7 @@ tabs:
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
-            User.chauth: true
+            User.change_authentication: true
             User.delete: true
     groups-tab:
         panel_tabs:
@@ -95,6 +96,7 @@ tabs:
         actions:
             Group.refresh: true
             Group.create_dialog: true
+            Group.update_dialog: true
             Group.quotas_dialog: true
             Group.delete: true
             Group.edit_admins: true
@@ -204,6 +206,7 @@ tabs:
             VM.disk_snapshot_delete: false
             VM.resched: true
             VM.unresched: true
+            VM.saveas_template: false
     templates-tab:
         panel_tabs:
             template_info_tab: true
@@ -389,6 +392,13 @@ tabs:
             Datastore.delete: true
             Datastore.enable: true
             Datastore.disable: true
+    vnets-topology-tab:
+        panel_tabs:
+        actions:
+            NetworkTopology.refresh: true
+            NetworkTopology.fit: true
+            NetworkTopology.collapseVMs: true
+            NetworkTopology.openVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: true
@@ -413,6 +423,7 @@ tabs:
             Network.create_dialog: true
             Network.import_dialog: true
             Network.update_dialog: true
+            Network.reserve_dialog: true
             Network.addtocluster: true
             Network.rename: true
             Network.chown: true
@@ -485,6 +496,8 @@ tabs:
                 Role.reboot_hard: true
                 Role.poweroff: true
                 Role.poweroff_hard: true
+                Role.undeploy: true
+                Role.undeploy_hard: true
                 Role.shutdown: true
                 Role.shutdown_hard: true
                 Role.delete: true
@@ -536,12 +549,13 @@ tabs:
         actions:
             ServiceTemplate.refresh: true
             ServiceTemplate.create_dialog: true
+            ServiceTemplate.update_dialog: true
             ServiceTemplate.instantiate: true
             ServiceTemplate.chown: true
             ServiceTemplate.chgrp: true
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
-            ServiceTemplate.clone: true
+            ServiceTemplate.clone_dialog: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index 75e9e69839..8e1815fd4b 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -398,7 +398,9 @@ tabs:
         panel_tabs:
         actions:
             NetworkTopology.refresh: true
-            NetworkTopology.toggleVMs: true
+            NetworkTopology.fit: true
+            NetworkTopology.collapseVMs: true
+            NetworkTopology.openVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: false
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index 53c35e8b17..f2990e782d 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -398,7 +398,9 @@ tabs:
         panel_tabs:
         actions:
             NetworkTopology.refresh: true
-            NetworkTopology.toggleVMs: true
+            NetworkTopology.fit: true
+            NetworkTopology.collapseVMs: true
+            NetworkTopology.openVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: false
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index cd95c1bc00..c9440f2264 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -16,6 +16,7 @@ enabled_tabs:
     #- clusters-tab
     #- hosts-tab
     - datastores-tab
+    - vnets-topology-tab
     - vnets-tab
     - secgroups-tab
     - vrouters-tab
@@ -77,7 +78,7 @@ tabs:
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
-            User.chauth: true
+            User.change_authentication: true
             User.delete: true
     groups-tab:
         panel_tabs:
@@ -98,6 +99,7 @@ tabs:
         actions:
             Group.refresh: true
             Group.create_dialog: true
+            Group.update_dialog: true
             Group.quotas_dialog: true
             Group.delete: true
             Group.edit_admins: true
@@ -207,6 +209,7 @@ tabs:
             VM.disk_snapshot_delete: true
             VM.resched: false
             VM.unresched: false
+            VM.saveas_template: true
     templates-tab:
         panel_tabs:
             template_info_tab: true
@@ -393,6 +396,13 @@ tabs:
             Datastore.delete: false
             Datastore.enable: false
             Datastore.disable: false
+    vnets-topology-tab:
+        panel_tabs:
+        actions:
+            NetworkTopology.refresh: true
+            NetworkTopology.fit: true
+            NetworkTopology.collapseVMs: true
+            NetworkTopology.openVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: true
@@ -417,6 +427,7 @@ tabs:
             Network.create_dialog: false
             Network.import_dialog: false
             Network.update_dialog: true
+            Network.reserve_dialog: true
             Network.addtocluster: false
             Network.rename: true
             Network.chown: false
@@ -489,6 +500,8 @@ tabs:
                 Role.reboot_hard: true
                 Role.poweroff: true
                 Role.poweroff_hard: true
+                Role.undeploy: true
+                Role.undeploy_hard: true
                 Role.shutdown: true
                 Role.shutdown_hard: true
                 Role.delete: true
@@ -540,12 +553,13 @@ tabs:
         actions:
             ServiceTemplate.refresh: true
             ServiceTemplate.create_dialog: true
+            ServiceTemplate.update_dialog: true
             ServiceTemplate.instantiate: true
             ServiceTemplate.chown: false
             ServiceTemplate.chgrp: false
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
-            ServiceTemplate.clone: true
+            ServiceTemplate.clone_dialog: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs: