diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index 08f661d57d..8a53e923ea 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -290,34 +290,20 @@ define(function(require) {
               '<i class="fa fa-laptop fa-lg"></i>&emsp;'+
               Locale.tr("Capacity")+
             '</span>'+
+            '<span>'+
+              '<span class="cpu_value">'+(capacity.CPU ? capacity.CPU : '-')+'</span> '+
+              '<small style="color: #999; margin-right: 10px">'+Locale.tr("CPU")+'</small>'+
+              '<span class="memory_value">'+memory_value+'</span>'+
+              ' '+
+              '<span class="memory_unit">'+memory_unit+'</span> '+
+              '<small style="color: #999; margin-right: 10px">'+Locale.tr("MEMORY")+'</small>'+
+              '<span class="cost_value">0.00</span> '+
+              '<small style="color: #999;">'+Locale.tr("COST")+' / ' + Locale.tr("HOUR") + '</small>'+
+            '</span>'+
           '</h3>'+
           '<br>'+
         '</div>'+
       '</div>'+
-      '<br>'+
-      '<div class="row">'+
-        '<div class="large-12 large-centered columns">'+
-          '<div class="row text-center">'+
-            '<div class="large-4 columns">'+
-              '<span class="cpu_value" style="color: #777; font-size:60px">'+(capacity.CPU ? capacity.CPU : '-')+'</span>'+
-              '<br>'+
-              '<span style="color: #999;">'+Locale.tr("CPU")+'</span>'+
-            '</div>'+
-            '<div class="large-4 columns">'+
-              '<span class="memory_value" style="color: #777; font-size:60px">'+memory_value+'</span>'+
-              ' '+
-              '<span class="memory_unit" style="color: #777; font-size:30px">'+memory_unit+'</span>'+
-              '<br>'+
-              '<span style="color: #999;">'+Locale.tr("MEMORY")+'</span>'+
-            '</div>'+
-            '<div class="large-4 columns provision_create_template_cost_div hidden">'+
-              '<span class="cost_value" style="color: #777; font-size:60px"></span>'+
-              '<br>'+
-              '<span style="color: #999;">'+Locale.tr("COST")+' / ' + Locale.tr("HOUR") + '</span>'+
-            '</div>'+
-          '</div>'+
-        '</div>'+
-      '</div>'+
       (Config.provision.create_vm.isEnabled("capacity_select") && (capacity.SUNSTONE_CAPACITY_SELECT != "NO") ?
       '<br>'+
       '<br>'+
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs
index e2e94fabd8..d8e9f12a77 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs
@@ -3,70 +3,82 @@
 </div>
 <div class="row">
   <div class="large-7 columns">
-    <label class="" for="MEMORY">
-      {{tr "Memory"}}
-      {{{tip (tr "Amount of RAM required for the VM, in Megabytes.")}}}
-    </label>
-    <div class="large-8 columns">
-      <div id="memory_slider" class="large-7 columns"></div>
+    <div class="row">
+      <div class="large-12 columns">
+        <label class="" for="MEMORY">
+          {{tr "Memory"}}
+          {{{tip (tr "Amount of RAM required for the VM, in Megabytes.")}}}
+        </label>
+        <div class="large-8 columns">
+          <div id="memory_slider" class="large-7 columns"></div>
+        </div>
+        <div class="large-2 columns">
+          <input type="text" id="MEMORY_TMP" name="memory_tmp" size="4" />
+        </div>
+        <div class="large-2 columns">
+          <select id="memory_unit" name="MEMORY_UNIT">
+            <option value="MB">{{tr "MB"}}</option>
+            <option value="GB">{{tr "GB"}}</option>
+          </select>
+        </div>
+      </div>
     </div>
-    <div class="large-2 columns">
-      <input type="text" id="MEMORY_TMP" name="memory_tmp" size="4" />
+    <div class="row">
+      <div class="large-12 columns">
+        <label class="" for="CPU">
+          {{tr "CPU"}}
+          {{{tip (tr "Percentage of CPU divided by 100 required for the Virtual Machine. Half a processor is written 0.5.")}}}
+        </label>
+        <div class="large-10 columns">
+          <div id="cpu_slider"></div>
+        </div>
+        <div class="large-2 columns">
+          <input type="text" wizard_field="CPU" id="CPU" name="cpu"/>
+        </div>
+      </div>
     </div>
-    <div class="large-2 columns">
-      <select id="memory_unit" name="MEMORY_UNIT">
-        <option value="MB">{{tr "MB"}}</option>
-        <option value="GB">{{tr "GB"}}</option>
-      </select>
+    <div class="row">
+      <div class="large-12 columns">
+        <label class="" for="VCPU">
+          {{tr "VCPU"}}
+          {{{tip (tr "Number of virtual cpus. This value is optional, the default hypervisor behavior is used, usually one virtual CPU.")}}}
+        </label>
+        <div class="large-10 columns">
+          <div id="vcpu_slider"></div>
+        </div>
+        <div class="large-2 columns">
+          <input type="text" wizard_field="VCPU" id="VCPU" name="vcpu"/>
+        </div>
+      </div>
+      <div class="large-5 columns"></div>
     </div>
   </div>
-  {{#isFeatureEnabled "showback"}}
-  <div class="large-2 columns">
-    <label  for="MEMORY_COST">
-      {{tr "Cost"}}
-      {{{tip (tr "Cost of each MB per hour")}}}
-    </label>
-    <input type="text" wizard_field="MEMORY_COST" id="MEMORY_COST" name="name"/>
+  <div class="large-5 columns">
+    {{#isFeatureEnabled "showback"}}
+    <fieldset>
+      <legend>{{tr "Cost"}}</legend>
+        <div class="large-6 columns">
+          <label  for="MEMORY_COST">
+            {{tr "Memory"}}
+            {{{tip (tr "Cost of each MB per hour")}}}
+          </label>
+          <input type="text" wizard_field="MEMORY_COST" id="MEMORY_COST" name="name"/>
+        </div>
+        <div class="large-6 columns">
+          <label  for="CPU_COST">
+            {{tr "CPU"}}
+            {{{tip (tr "Cost of each CPU per hour")}}}
+          </label>
+          <input type="text" wizard_field="CPU_COST" id="CPU_COST" name="name"/>
+        </div>
+        <div class="large-6 columns left">
+          <label  for="DISK_COST">
+            {{tr "Disk"}}
+            {{{tip (tr "Cost of each MB per hour")}}}
+          </label>
+          <input type="text" wizard_field="DISK_COST" id="DISK_COST" name="name"/>
+        </div>
+    </fieldset>
+    {{/isFeatureEnabled}}
   </div>
-  <div class="large-3 columns"></div>
-  {{/isFeatureEnabled}}
-</div>
-<div class="row">
-  <div class="large-7 columns">
-    <label class="" for="CPU">
-      {{tr "CPU"}}
-      {{{tip (tr "Percentage of CPU divided by 100 required for the Virtual Machine. Half a processor is written 0.5.")}}}
-    </label>
-    <div class="large-10 columns">
-      <div id="cpu_slider"></div>
-    </div>
-    <div class="large-2 columns">
-      <input type="text" wizard_field="CPU" id="CPU" name="cpu"/>
-    </div>
-  </div>
-  {{#isFeatureEnabled "showback"}}
-  <div class="large-2 columns">
-    <label  for="CPU_COST">
-      {{tr "Cost"}}
-      {{{tip (tr "Cost of each CPU per hour")}}}
-    </label>
-    <input type="text" wizard_field="CPU_COST" id="CPU_COST" name="name"/>
-  </div>
-  <div class="large-3 columns"></div>
-  {{/isFeatureEnabled}}
-</div>
-<div class="row">
-  <div class="large-7 columns">
-    <label class="" for="VCPU">
-      {{tr "VCPU"}}
-      {{{tip (tr "Number of virtual cpus. This value is optional, the default hypervisor behavior is used, usually one virtual CPU.")}}}
-    </label>
-    <div class="large-10 columns">
-      <div id="vcpu_slider"></div>
-    </div>
-    <div class="large-2 columns">
-      <input type="text" wizard_field="VCPU" id="VCPU" name="vcpu"/>
-    </div>
-  </div>
-  <div class="large-5 columns"></div>
 </div>