diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
index 3323dc2eea..86c07706a0 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
@@ -71,7 +71,6 @@ define(function(require) {
 
   function _setup(context) {
     var that = this;
-    Tips.setup(context);
 
     CustomTagsTable.setup(context);
 
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
index bc67ecf18f..9d80227104 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
@@ -78,7 +78,6 @@ define(function(require) {
   }
 
   function _setup(context) {
-    Tips.setup(context);
 
     context.on("change", "#LOGO", function() {
       $("#template_create_logo", context).show();
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
index 2ebaa97622..2a9b2ce7ee 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
@@ -31,8 +31,6 @@ define(function(require) {
   }
 
   function _setup(context) {
-    Tips.setup(context);
-
     // Define the cpu slider
     var cpu_input = $("#CPU", context);
     var cpu_slider = $("#cpu_slider", context)
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
index d83abff038..9c17f37c0b 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
@@ -480,38 +480,38 @@ define(function(require) {
     var providerSection = $('#' + htmlId + 'Tab', context);
 
     providerSection.on("change", "input.hybridRadio", function() {
-        $(".hybrid_inputs", providerSection).html("");
+      $(".hybrid_inputs", providerSection).html("");
 
-        var required_str = "";
-        var not_required_str = "";
+      var required_str = "";
+      var not_required_str = "";
 
-        $.each(HYBRID_INPUTS[this.value], function(index, obj) {
-          if (obj.required) {
-            required_str += '<div class="large-6 columns">' +
-              '<label>' +
-                obj.label +
-                Tips.html(obj.tooltip) +
-              '</label>' +
-              '<input wizard_field="' + obj.name + '" type="text" id="' + obj.name + '">' +
-            '</div>'
-          } else {
-            not_required_str += '<div class="large-6 columns">' +
-              '<label>' +
-                obj.label +
-                Tips.html(obj.tooltip) +
-              '</label>' +
-              '<input wizard_field="' + obj.name + '" type="text" id="' + obj.name + '">' +
-            '</div>'
-          }
-        });
+      $.each(HYBRID_INPUTS[this.value], function(index, obj) {
+        if (obj.required) {
+          required_str += '<div class="large-6 columns">' +
+            '<label>' +
+              obj.label + ' ' +
+              Tips.html(obj.tooltip) +
+            '</label>' +
+            '<input wizard_field="' + obj.name + '" type="text" id="' + obj.name + '">' +
+          '</div>'
+        } else {
+          not_required_str += '<div class="large-6 columns">' +
+            '<label>' +
+              obj.label + ' ' +
+              Tips.html(obj.tooltip) +
+            '</label>' +
+            '<input wizard_field="' + obj.name + '" type="text" id="' + obj.name + '">' +
+          '</div>'
+        }
+      });
 
-        $(".hybrid_inputs", providerSection).append(
-          required_str +
-          '<br><hr><br>' +
-          not_required_str)
+      $(".hybrid_inputs", providerSection).append(
+        required_str +
+        '<br><hr><br>' +
+        not_required_str);
 
-        Tips.setup($(".hybrid_inputs", providerSection));
-      })
+      providerSection.foundation('tooltip', 'reflow');
+    })
   }
 
   function _fillProviderTab(context, provider, providerType, clickButton) {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
index e2372d645c..6e17558d76 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
@@ -56,8 +56,6 @@ define(function(require) {
   }
 
   function _setup(context) {
-    Tips.setup(context);
-
     $("input[name='graphics_type']", context).change(function() {
       $("#TYPE", context).val($(this).attr("value"))
       $("#LISTEN", context).val("0.0.0.0")
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js
index 94b32823bd..c6e7ef0592 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js
@@ -70,7 +70,6 @@ define(function(require) {
     that.numberOfNics = 0;
     that.nicTabObjects = {};
 
-    Tips.setup(context);
     context.foundation('reflow', 'tab');
 
     // close icon: removing the tab on click
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
index 455c0715c2..b159243441 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
@@ -65,7 +65,7 @@ define(function(require) {
 
   function _setup(context) {
     var that = this;
-    Tips.setup(context);
+    context.foundation('tooltip', 'reflow');
     that.vnetsTable.initialize({
       'selectOptions': {
         'select_callback': function(aData, options) {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
index 64fef7386f..bb359a5744 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
@@ -170,7 +170,6 @@ define(function(require) {
 
   function _setup(context) {
     var that = this;
-    Tips.setup(context);
     context.foundation('reflow', 'tab');
 
     var kernelDSContext = $(".kernel_ds",  context);
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
index fcbb1c4e77..cd142c89a7 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
@@ -59,8 +59,6 @@ define(function(require) {
   }
 
   function _setup(context) {
-    Tips.setup(context);
-
     CustomTagsTable.setup(context);
 
     context.on("change", "#raw_type", function() {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
index 51a15a018e..db4f853297 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
@@ -73,7 +73,6 @@ define(function(require) {
 
   function _setup(context) {
     var  that = this;
-    Tips.setup(context);
     context.foundation('reflow', 'tab');
 
     context.on("change", "input[name='req_select']", function() {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js
index 5a07cfad45..2c57771a70 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js
@@ -70,8 +70,7 @@ define(function(require) {
     that.numberOfDisks = 0;
     that.diskTabObjects = {};
 
-    Tips.setup(context);
-    context.foundation('reflow', 'tab');
+    context.foundation('tab', 'reflow');
 
     // close icon: removing the tab on click
     context.on("click", "i.remove-tab", function() {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
index c02b68bf45..c4189cd041 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
@@ -55,7 +55,7 @@ define(function(require) {
 
   function _setup(context) {
     var that = this;
-    Tips.setup(context);
+    context.foundation('tooltip', 'reflow');
     that.imageTable.initialize({
       'selectOptions': {
         'select_callback': function(aData, options) {