diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs
index d2ae6e611a..b224afa376 100644
--- a/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs
@@ -38,7 +38,7 @@
       </div>
       <div class="large-9 medium-8 columns text-center">
         <div class="large-10 medium-12 large-centered columns">
-        <div class="large-3 medium-3 columns">
+        <div class="large-3 medium-3 small-6 columns">
           <h4>
             <span id="provision_dashboard_running">
               <i class="fa fa-spinner fa-spin"></i>
@@ -46,7 +46,7 @@
             <small class="subheader">{{tr "RUNNING"}}</small>
           </h4>
         </div>
-        <div class="large-3 medium-3 columns ">
+        <div class="large-3 medium-3 small-6 columns ">
           <h4>
             <span id="provision_dashboard_deploying" >
               <i class="fa fa-spinner fa-spin"></i>
@@ -54,7 +54,7 @@
             <small class="subheader">{{tr "DEPLOYING"}}</small>
           </h4>
         </div>
-        <div class="large-3 medium-3 columns">
+        <div class="large-3 medium-3 small-6 columns">
           <h4>
             <span  id="provision_dashboard_off">
               <i class="fa fa-spinner fa-spin"></i>
@@ -62,7 +62,7 @@
             <small class="subheader">{{tr "OFF"}}</small>
           </h4>
         </div>
-        <div class="large-3 medium-3 columns ">
+        <div class="large-3 medium-3 small-6 columns ">
           <h4>
             <span  id="provision_dashboard_error">
               <i class="fa fa-spinner fa-spin"></i>
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
index 0ae3224a57..6f7ca5d27f 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
@@ -20,10 +20,10 @@
     </div>
   </div>
   <div class="row">
-    <div class="large-6 columns">
+    <div class="medium-6 columns">
       <input type="text" id="vm_name" class="provision-input" placeholder="{{tr "Virtual Machine Name"}}"/>
     </div>
-    <div class="large-3 columns">
+    <div class="large-3 medium-6 columns">
       <div class="switch left">
         <input class="switch-input instantiate_pers" id="instantiate_pers" type="checkbox">
         <label class="switch-paddle" for="instantiate_pers">
@@ -35,7 +35,7 @@
         {{{tip (tr "Creates a private persistent copy of the template plus any image defined in DISK, and instantiates that copy")}}}
       </label>
     </div>
-    <div class="large-3 columns">
+    <div class="large-3 medium-6 columns">
       <button href="#" class="button success expanded" type="submit">{{tr "Create"}}</button>
       <div data-alert class="label alert-box-error" hidden></div>
     </div>
@@ -99,17 +99,21 @@
     </div>
   </fieldset>
   <div class="row">
-    <div class="large-6 columns">
+    <div class="medium-6 small-12 columns">
       <div class="provision_capacity_selector"></div>
     </div>
-    <div class="large-6 columns">
+    <div class="medium-6 small-12 columns columns">
       <div class="provision_disk_selector"></div>
     </div>
-    <div class="small-12 columns">
-      <div class="provision_network_selector"></div>
-    </div>
-    <div class="large-6 columns">
+  </div>
+  <div class="row">
+    <div class="medium-6 small-12 columns">
       <div class="provision_custom_attributes_selector"></div>
     </div>
   </div>
+  <div class="row">
+    <div class="small-12 columns">
+      <div class="provision_network_selector"></div>
+    </div>
+  </div>
 </form>
\ No newline at end of file
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 11c6fd4e14..b94d6188b7 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
@@ -16,7 +16,7 @@
 
 
 <div class="row">
-  <div class="small-12 columns">
+  <div class="large-6 medium-8 small-12 columns">
     <label class="" for="MEMORY">
       {{tr "Memory"}}
       {{{tip (tr "Amount of RAM required for the VM, in Megabytes.")}}}
@@ -26,7 +26,7 @@
   </div>
 </div>
 <div class="row">
-  <div class="small-12 columns">
+  <div class="medium-6 small-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.")}}}
@@ -34,9 +34,7 @@
     <div class="cpu_input">
     </div>
   </div>
-</div>
-<div class="row">
-  <div class="small-12 columns">
+  <div class="medium-6 small-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.")}}}
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs
index 73fd013c7f..3c21ec567b 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs
@@ -18,7 +18,7 @@
   {{element.NAME}}
 </h6>
 <div class="row">
-  <div class="large-6 small-12 columns capacityContext{{element.ID}}">
+  <div class="medium-6 small-12 columns capacityContext{{element.ID}}">
     <fieldset>
       <legend>
         <i class="fa fa-laptop"></i> {{tr "Capacity"}}
@@ -32,8 +32,12 @@
       </div>
     </fieldset>
   </div>
-  <div class="large-6 small-12 columns  disksContext{{element.ID}}"></div>
-  <div class="large-6 small-12 columns template_user_inputs{{element.ID}}"></div>
+  <div class="medium-6 small-12 columns disksContext{{element.ID}}"></div>
+</div>
+<div class="row">
+  <div class="medium-6 small-12 columns template_user_inputs{{element.ID}}"></div>
+</div>
+<div class="row">
   <div class="small-12 columns nicsContext{{element.ID}}">
     <div class="provision_network_selector">
     </div>
diff --git a/src/sunstone/public/app/utils/range-slider/html.hbs b/src/sunstone/public/app/utils/range-slider/html.hbs
index 55e5415ba0..44fcf96f88 100644
--- a/src/sunstone/public/app/utils/range-slider/html.hbs
+++ b/src/sunstone/public/app/utils/range-slider/html.hbs
@@ -21,7 +21,7 @@
     <label for="input-{{sliderId}}">{{label}}</label>
   </div>
   {{/if}}
-  <div class="small-8 columns">
+  <div class="large-8 small-6 columns">
     <input id="input-{{sliderId}}" type="range" class="uinput-slider"
       min="{{min}}" max="{{max}}" step="{{step}}" 
       value="{{initial}}" 
@@ -33,7 +33,7 @@
     {{/each}}
     </datalist>
   </div>
-  <div class="small-4 columns">
+  <div class="large-4 small-6 columns">
     <input type="number" class="uinput-slider-val" 
       min="{{min}}" max="{{max}}" step="{{step}}" 
       value="{{initial}}"