diff --git a/src/sunstone/public/app/tabs/datastores-tab/buttons.js b/src/sunstone/public/app/tabs/datastores-tab/buttons.js
index 70dc9fc6f2..cf496707c2 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/buttons.js
@@ -25,13 +25,16 @@ define(function(require) {
     },
     "Datastore.create_dialog" : {
       type: "create_dialog",
-      layout: "create"
+      text:  Locale.tr("Create"),
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list"
     },
     "Datastore.import_dialog" : {
       type: "create_dialog",
-      layout: "create",
       text:  Locale.tr("Import"),
-      icon: '<i class="fas fa-download"/>'
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list",
+      alwaysActive: true
     },
     "Datastore.addtocluster" : {
       type : "action",
diff --git a/src/sunstone/public/app/tabs/images-tab/buttons.js b/src/sunstone/public/app/tabs/images-tab/buttons.js
index 7914818109..50fe49ba78 100644
--- a/src/sunstone/public/app/tabs/images-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/images-tab/buttons.js
@@ -26,7 +26,9 @@ define(function(require) {
     },
     "Image.create_dialog" : {
       type: "create_dialog",
-      layout: "create"
+      text:  Locale.tr("Create"),
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list"
     },
     "Image.upload_marketplace_dialog" : {
       type: "action",
@@ -34,9 +36,10 @@ define(function(require) {
     },
     "Image.import_dialog" : {
       type: "create_dialog",
-      layout: "create",
       text:  Locale.tr("Import"),
-      icon: '<i class="fas fa-download"/>'
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list",
+      alwaysActive: true
     },
     "Image.chown" : {
       type: "confirm_with_select",
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
index 908dae16d6..e0129a2ff0 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
@@ -25,7 +25,9 @@ define(function(require) {
     },
     "ServiceTemplate.create_dialog" : {
       type: "create_dialog",
-      layout: "create"
+      text:  Locale.tr("Create"),
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list"
     },
     "ServiceTemplate.update_dialog" : {
       type: "action",
@@ -33,9 +35,9 @@ define(function(require) {
       text: Locale.tr("Update")
     },
     "ServiceTemplate.instantiate_dialog" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Instantiate")
+      type: "create_dialog",
+      text:  Locale.tr("Instantiate"),
+      layout: "create_flatten"
     },
     "ServiceTemplate.chown" : {
       type: "confirm_with_select",
diff --git a/src/sunstone/public/app/tabs/templates-tab/buttons.js b/src/sunstone/public/app/tabs/templates-tab/buttons.js
index 7874abd261..81bee7be11 100644
--- a/src/sunstone/public/app/tabs/templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/templates-tab/buttons.js
@@ -26,13 +26,15 @@ define(function(require) {
     },
     "Template.create_dialog" : {
       type: "create_dialog",
-      layout: "create"
+      text:  Locale.tr("Create"),
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list"
     },
     "Template.import_dialog" : {
       type: "create_dialog",
-      layout: "create",
       text:  Locale.tr("Import"),
-      icon: '<i class="fas fa-download"/>',
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list",
       alwaysActive: true
     },
     "Template.update_dialog" : {
@@ -41,9 +43,9 @@ define(function(require) {
       text: Locale.tr("Update")
     },
     "Template.instantiate_vms" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Instantiate")
+      type: "create_dialog",
+      text:  Locale.tr("Instantiate"),
+      layout: "create_flatten"
     },
     "Template.chown" : {
       type: "confirm_with_select",
diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js b/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js
index eba459aafe..42e65b0bf9 100644
--- a/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js
+++ b/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js
@@ -139,6 +139,11 @@ define(function(require) {
         //Sunstone.resetFormPanel(TAB_ID, INSTANTIATE_DIALOG_ID);
         var selected_nodes = Sunstone.getDataTable(TAB_ID).elements();
 
+        if (selected_nodes.length != 1) {
+          Notifier.notifyMessage("Please select one (and just one) Virtual Network Template.");
+          return false;
+        }
+
         Sunstone.showFormPanel(TAB_ID, INSTANTIATE_DIALOG_ID, "instantiate",
           function(formPanelInstance, context) {
             formPanelInstance.setTemplateIds(context, selected_nodes);
diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js b/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js
index b65f5eccaa..e33a51bf62 100644
--- a/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js
@@ -26,7 +26,9 @@ define(function(require) {
     },
     "VNTemplate.create_dialog" : {
       type: "create_dialog",
-      layout: "create"
+      text:  Locale.tr("Create"),
+      layout: "create_flatten",
+      custom_classes: "only-sunstone-list"
     },
     "VNTemplate.update_dialog" : {
       type: "action",
@@ -34,9 +36,9 @@ define(function(require) {
       text: Locale.tr("Update")
     },
     "VNTemplate.instantiate_vnets" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Instantiate")
+      type: "create_dialog",
+      text:  Locale.tr("Instantiate"),
+      layout: "create_flatten"
     },
     "VNTemplate.addtocluster" : {
       type : "action",
diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js
index c0dd388b77..6c81314f6e 100644
--- a/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js
@@ -25,9 +25,9 @@ define(function(require) {
     "VirtualRouterTemplate.update_dialog" : TemplateButtons["Template.update_dialog"],
 //    "VirtualRouterTemplate.instantiate_vms" : TemplateButtons["Template.instantiate_vms"],
     "VirtualRouterTemplate.instantiate_dialog" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Instantiate")
+      type: "create_dialog",
+      text:  Locale.tr("Instantiate"),
+      layout: "create_flatten"
     },
     "VirtualRouterTemplate.chown" : TemplateButtons["Template.chown"],
     "VirtualRouterTemplate.chgrp" : TemplateButtons["Template.chgrp"],