diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
index 4801f8e082..3e59b2e7b9 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
@@ -2,24 +2,25 @@
     <h1 class="grey ">Android Sense</h1>
     <hr>
     <p class="margin-bottom-double light-grey ">Connect your Android device
-                                                to the WSO2 device cloud.</p>
+        to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/android-sense-icon.png" class="img-responsive">
 </div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
     <p class="grey margin-top">Hardware Requirements </p>
     <br>
     <ul class="list-unstyled">
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+        <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> Android device</li>
 
     </ul>
 
     <br>
-    <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}" data-url="{{enrollmentURl}}">
+    <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}"
+       data-sketchtype="{{@uriParams.deviceType}}" data-url="{{enrollmentURl}}">
         <i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
     <br/><br/>
 
@@ -47,7 +48,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-400-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -63,10 +64,10 @@
 
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                            Goto Login Page
                         </a>&nbsp;&nbsp;
                         <a href="#" onclick="hidePopup();" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                            Cancel
                         </a>
                     </div>
                 </div>
@@ -82,7 +83,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-403-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -98,7 +99,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-409-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -114,7 +115,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -125,7 +126,7 @@
     <br/><br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3>
     <hr>
     <p class="grey margin-top">Get your device ready</p>
@@ -140,7 +141,7 @@
     <br>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double">
     <h3 class="uppercase">Connect (Quick Start)</h3>
     <hr>
     <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
@@ -152,11 +153,15 @@
 
         <li class="padding-top-double"><span class="circle">03</span> Start the Android Sense app in your device.</li>
 
-        <li class="padding-top-double"><span class="circle">04</span> Fill the login form with the credentials (Use server URL as <i>https://'<'YOUR_HOST'>':9443</i> and click on <strong>Enroll Device</strong> button.</li>
+        <li class="padding-top-double"><span class="circle">04</span> Fill the login form with the credentials
+            (Use server URL as <i>https://'<'YOUR_HOST'>':9443</i> and click on <strong>Enroll Device</strong>
+            button.</li>
 
-        <li class="padding-top-double"><span class="circle">05</span> Once the device is enrolled, click on the <strong>+</strong> button to select the sensors.</li>
+        <li class="padding-top-double"><span class="circle">05</span> Once the device is enrolled, click on the
+            <strong>+</strong> button to select the sensors.</li>
 
-        <li class="padding-top-double"><span class="circle">06</span> Click on the <i>Publish data</i> button to publish the sensor readings to the IOT server.</li>
+        <li class="padding-top-double"><span class="circle">06</span> Click on the <i>Publish data</i> button to publish
+            the sensor readings to the IOT server.</li>
     </ul>
     <br>
 </div>
@@ -184,7 +189,6 @@
                     </div>
                     <div class="buttons" style="padding-bottom: 0px">
                         <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
-                        &nbsp;&nbsp;
                     </div>
                 </form>
             </div>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
index 47341f86e6..2cad5a6cba 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
@@ -4,11 +4,11 @@
         <hr>
         <p class="margin-bottom-double light-grey ">Connect your Arduino device to the WSO2 IoT Server.</p>
     </div>
-    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+    <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
         <img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive">
     </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
         <h3 class="uppercase">Ingredients</h3>
         <hr>
         <p class="grey margin-top">Hardware Requirements </p>
@@ -30,7 +30,7 @@
         <br>
 
         <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
-           class="btn-operations" target="_blank"><i class="fw fw-api"></i> View API</i> &nbsp;</a>
+           class="btn-operations" target="_blank"><i class="fw fw-api"></i> View API</a>
         <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
         <div id="download-device-modal-content" class="hide">
@@ -56,12 +56,12 @@
                             </div>
                             <div class="buttons" style="padding-bottom: 0px">
                                 <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                                                                        Now</a>
+                                    Now</a>
                                 &nbsp;&nbsp;
                                 <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                    &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Copy Link
                                 </a>
-                                &nbsp;&nbsp;
+
                             </div>
                         </form>
                     </div>
@@ -77,7 +77,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-400-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -93,10 +93,10 @@
 
                         <div class="buttons">
                             <a href="#" id="device-401-link" class="blue-button">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                                Goto Login Page
                             </a>&nbsp;&nbsp;
                             <a href="#" onclick="hidePopup();" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                Cancel
                             </a>
                         </div>
                     </div>
@@ -112,7 +112,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-403-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -128,7 +128,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-409-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -144,7 +144,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -155,20 +155,20 @@
         <br/><br/>
     </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
         <h3 class="uppercase">Prepare</h3>
         <hr>
         <p class="grey margin-top">Get your device ready</p>
         <br/>
         <ul class="list-unstyled">
             <li class="padding-top-double"><span class="circle">01</span> Get your Arduino device and download the Agent
-                                                                          Sketch.
+                Sketch.
             </li>
             <li class="padding-top-double"><span class="circle">02</span> Open the downloaded Arduino sketch and fill in
-                                                                          the pins that you wish to read/control.
+                the pins that you wish to read/control.
             </li>
             <li class="padding-top-double"><span class="circle">03</span> Burn the sketch onto your Arduino board and
-                                                                          let the program run.
+                let the program run.
             </li>
         </ul>
         <br>
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
index 8a175918d8..593c1326e6 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
@@ -1,32 +1,38 @@
-<div class="col-lg-12  margin-top-double" xmlns="http://www.w3.org/1999/html">
+<div class="col-lg-12  margin-top-double">
     <h1 class="grey ">Digital Display</h1>
     <hr>
     <p class="margin-bottom-double light-grey ">Connect your Digital Display
         to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/display-icon.png" class="img-responsive">
 </div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-        <h3 class="uppercase">Ingredients</h3>
-        <hr>
-        <p class="grey margin-top">Hardware Requirements </p>
-        <br>
-        <ul>
-            <span class="fw-stack fw-lg margin-right">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+    <h3 class="uppercase">Ingredients</h3>
+    <hr>
+    <p class="grey margin-top">Hardware Requirements </p>
+    <br>
+    <ul class="list-unstyled">
+        <li>
+                <span class="fw-stack margin-right">
                     <i class="fw fw-ring fw-stack-2x"> </i>
                     <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Raspberry Pi <br/>
-            <span class="fw-stack fw-lg margin-right">
+                </span> Raspberry Pi
+        </li>
+        <li>
+                <span class="fw-stack margin-right">
                     <i class="fw fw-ring fw-stack-2x"> </i>
                     <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> WIFI Shield<br/>
-            <span class="fw-stack fw-lg margin-right">
+                </span> WIFI Shield
+        </li>
+        <li>
+                <span class="fw-stack margin-right">
                     <i class="fw fw-ring fw-stack-2x"> </i>
                     <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Digital Display with HDMI Cable<br/>
-        </ul>
-        <br>
+                </span> Digital Display with HDMI Cable
+        </li>
+    </ul>
+    <br>
 
     <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
@@ -56,9 +62,9 @@
                                 Now</a>
                             &nbsp;&nbsp;
                             <a href="#" id="download-device-download-link" class="blue-button">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                                Copy Link
                             </a>
-                            &nbsp;&nbsp;
+
                         </div>
                     </form>
                 </div>
@@ -90,7 +96,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-400-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -106,10 +112,10 @@
 
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                            Goto Login Page
                         </a>&nbsp;&nbsp;
                         <a href="#" onclick="hidePopup();" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                            Cancel
                         </a>
                     </div>
                 </div>
@@ -125,7 +131,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-403-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -141,7 +147,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-409-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -157,7 +163,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -168,40 +174,49 @@
     <br/><br/>
 </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-        <h3 class="uppercase">Prepare</h3><hr>
-        <p class="grey margin-top">Get your device ready</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the Digital Display setup.</p>
-            <p class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</p>
-            <p class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</p>
-        </ul>
-        <br>
-    </div>
+<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
+    <h3 class="uppercase">Prepare</h3><hr>
+    <p class="grey margin-top">Get your device ready</p>
+    <br/>
+    <ul class="list-unstyled">
+        <li class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in
+            the schematic below and get the Digital Display setup.</li>
+        <li class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the
+            HDMI cable to get a UI view of the device.</li>
+        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet
+            (via Ethernet or Wifi) and note its IP_ADDRESS</li>
+    </ul>
+    <br>
+</div>
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Schematic Diagram</h3><hr>
-        <p class="grey margin-top">Click on the image to zoom</p>
-        <center>
-            <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
-                <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
-            </a>
-        </center>
-        <br/>
-    </div>
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+    <h3 class="uppercase">Schematic Diagram</h3><hr>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
+        </a>
+    </center>
+    <br/>
+</div>
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Connect (Quick Start)</h3><hr>
-        <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the Digital Display setup files</b></p>
-            <p class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'</b> login from a remote PC)</i></p>
-            <p class="padding-top-double"><span class="circle">03</span> <b>Download the Digital Display setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></p>
-        </ul>
-        <br>
-    </div>
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+    <h3 class="uppercase">Connect (Quick Start)</h3><hr>
+    <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
+    <br/>
+    <ul class="list-unstyled">
+        <li class="padding-top-double"><span class="circle">01</span>
+            Click on the <i>'Create DEB'</i> button above to get the download link for the Digital Display setup
+            files</li>
+        <li class="padding-top-double"><span class="circle">02</span> (The following commands can be issued by
+            directly typing into the terminal of the device or by an <b>'ssh'</b> login from a remote PC)</li>
+        <li class="padding-top-double"><span class="circle">03</span> Download the Digital Display setup files
+            using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'
+            This will download a zip file named 'Agent.zip'
+        </li>
+    </ul>
+    <br>
+</div>
 
 </div>
 
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/type-view.hbs b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/type-view.hbs
index 36aab3a5bd..5918371107 100644
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/type-view.hbs
+++ b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/type-view.hbs
@@ -3,18 +3,22 @@
     <hr>
     <p class="margin-bottom-double light-grey ">Connect your drone device to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/drone-icon.png" class="img-responsive">
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
     <p class="grey margin-top">Hardware Requirements </p>
     <br>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> IRIS+ Drone</li>
-        <li class="padding-top-double"><span class="circle">02</span> USB to Micro USB cable or Telemetry Radio receiver</li>
+        <li>
+            <span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> IRIS+ Drone</li>
+        <li>
+            <span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> USB to Micro USB cable or Telemetry Radio receiver</li>
     </ul>
     <br>
 
@@ -47,9 +51,9 @@
                                 Now</a>
                             &nbsp;&nbsp;
                             <a href="#" id="download-device-download-link" class="blue-button">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                                Copy Link
                             </a>
-                            &nbsp;&nbsp;
+
                         </div>
                     </form>
                 </div>
@@ -65,7 +69,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-400-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -81,10 +85,10 @@
 
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                            Goto Login Page
                         </a>&nbsp;&nbsp;
                         <a href="#" onclick="hidePopup();" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                            Cancel
                         </a>
                     </div>
                 </div>
@@ -100,7 +104,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-403-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -116,7 +120,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-409-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -132,7 +136,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -143,7 +147,7 @@
     <br/><br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3><hr>
     <p class="grey margin-top">Get your device ready</p>
     <ul class="list-unstyled">
@@ -152,57 +156,57 @@
     <br>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Schematic Diagram</h3><hr>
     <p class="grey margin-top">Click on the image to zoom</p>
     <center>
         <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
-            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
+            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive" >
         </a>
     </center>
     <br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Connect (Quick Start)</h3><hr>
     <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
     <ul class="list-unstyled">
         <li class="padding-top-double"><span class="circle">01</span> <b>Click on the download button above to get the IRIS+ Drone setup files</b></li>
         <li class="padding-top-double"><span class="circle">02</span> <b>Connecting to drone</b>
-            </br>
-            <div>
-                <table class="table table-bordered ">
-                    <thead>
-                    <tr>
-                        <th>Connection type</th>
-                        <th>Connection string</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>Linux computer connected to the drone via USB</td>
-                        <td>/dev/ttyAMA0(also set baud=57600)</td>
-                    </tr>
-                    <tr>
-                        <td>OSX computer connected to the drone via USB</td>
-                        <td>dev/cu.usbmodem1</td>
-                    </tr>
-                    <tr>
-                        <td>Windows computer connected to the drone via USB (in this case on COM14)</td>
-                        <td>com14</td>
-                    </tr>
-                    <tr>
-                        <td>Windows computer connected to the drone using a 3DR Telemetry Radio on COM14</td>
-                        <td>com14(also set baud=57600)</td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            Ones you have the setup files please run startservice.sh with root privilege.</br>
-            <b>Note:</b> these connection types may vary from computer to computer. So please provide the correct
-            connection port
         </li>
     </ul>
+    <div class="padding-top-double">
+        <table class="table table-bordered ">
+            <thead>
+            <tr>
+                <th>Connection type</th>
+                <th>Connection string</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>Linux computer connected to the drone via USB</td>
+                <td>/dev/ttyAMA0(also set baud=57600)</td>
+            </tr>
+            <tr>
+                <td>OSX computer connected to the drone via USB</td>
+                <td>dev/cu.usbmodem1</td>
+            </tr>
+            <tr>
+                <td>Windows computer connected to the drone via USB (in this case on COM14)</td>
+                <td>com14</td>
+            </tr>
+            <tr>
+                <td>Windows computer connected to the drone using a 3DR Telemetry Radio on COM14</td>
+                <td>com14(also set baud=57600)</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    Ones you have the setup files please run startservice.sh with root privilege.</br>
+    <b>Note:</b> these connection types may vary from computer to computer. So please provide the correct
+    connection port
+
     <br/>
 </div>
 
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index abbd250d5c..0db0bd5ebc 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -4,33 +4,33 @@
         <hr>
         <p class="margin-bottom-double light-grey ">Connect your RaspberryPi device to the WSO2 IoT Server.</p>
     </div>
-    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+    <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
         <img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive">
     </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
         <h3 class="uppercase">Ingredients</h3>
         <hr>
         <p class="grey margin-top">Hardware Requirements </p>
         <br>
         <ul class="list-unstyled">
-            <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+            <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> Raspberry Pi (Internet Enabled)
             </li>
-            <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+            <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> DHT11 Temperature Sensor
             </li>
-            <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+            <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> LED
             </li>
-            <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+            <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> Buzzer(3v)
             </li>
         </ul>
         <br>
 
         <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
-           class="btn-operations" target="_blank"><i class="fw fw-api"></i> View API</i> &nbsp;</a>
+           class="btn-operations" target="_blank"><i class="fw fw-api"></i> View API</a>
         <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
         <div id="download-device-modal-content" class="hide">
@@ -51,17 +51,17 @@
                                     <input type="hidden" class="deviceType" name="deviceType"
                                            value="{{@uriParams.deviceType}}"/>
                                     <input type="hidden" class="sketchType" name="sketchType"
-                                           value="{{@uriParams.deviceType}}"/> &nbsp;&nbsp;
+                                           value="{{@uriParams.deviceType}}"/>
                                 </div>
                             </div>
                             <div class="buttons" style="padding-bottom: 0px">
                                 <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                                                                        Now</a>
+                                    Now</a>
                                 &nbsp;&nbsp;
                                 <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                    &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Copy Link
                                 </a>
-                                &nbsp;&nbsp;
+
                             </div>
                         </form>
                     </div>
@@ -77,7 +77,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-400-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -93,10 +93,10 @@
 
                         <div class="buttons">
                             <a href="#" id="device-401-link" class="blue-button">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                                Goto Login Page
                             </a>&nbsp;&nbsp;
                             <a href="#" onclick="hidePopup();" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                Cancel
                             </a>
                         </div>
                     </div>
@@ -112,7 +112,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-403-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -128,7 +128,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-409-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -144,7 +144,7 @@
 
                         <div class="buttons">
                             <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                OK
                             </a>
                         </div>
                     </div>
@@ -155,20 +155,20 @@
         <br/><br/>
     </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
         <h3 class="uppercase">Prepare</h3>
         <hr>
         <p class="grey margin-top">Get your device ready</p>
         <br/>
         <ul class="list-unstyled">
             <li class="padding-top-double"><span class="circle">01</span> Get your RaspberryPi device and download the Agent
-                                                                          Sketch.
+                Sketch.
             </li>
             <li class="padding-top-double"><span class="circle">02</span> Open the downloaded RaspberryPi sketch and fill in
-                                                                          the pins that you wish to read/control.
+                the pins that you wish to read/control.
             </li>
             <li class="padding-top-double"><span class="circle">03</span> Burn the sketch onto your RaspberryPi board and
-                                                                          let the program run.
+                let the program run.
             </li>
         </ul>
         <br>
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index 9066985b84..30b0b1b62b 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -3,11 +3,11 @@
     <hr>
     <p class="margin-bottom-double light-grey ">Connect your Android device to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/firealarm-icon.png" class="img-responsive">
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
     <p class="grey margin-top">Hardware Requirements </p>
@@ -24,7 +24,8 @@
     </ul>
     <br>
 
-    <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" class="btn-operations" target="_blank" ><i class="fw fw-api"></i> View API</i> &nbsp;</a>
+    <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" class="btn-operations"
+       target="_blank" ><i class="fw fw-api"></i> View API</i> &nbsp;</a>
     <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
     <div id="download-device-modal-content" class="hide">
@@ -42,8 +43,10 @@
                                        name="deviceName" size="60" required>
                                 <br/><br/>
                                 <input type="hidden" class="deviceType" name="deviceType" value="{{@uriParams.deviceType}}"/>
-                                <input type="radio" name="sketchType" value="simple_agent" id="simple_agent" checked> <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
-                                <input type="radio" name="sketchType" value="advanced_agent" id="advanced_agent"> <label for="advanced_agent">Advanced Agent</label>
+                                <input type="radio" name="sketchType" value="simple_agent" id="simple_agent" checked>
+                                <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
+                                <input type="radio" name="sketchType" value="advanced_agent" id="advanced_agent">
+                                <label for="advanced_agent">Advanced Agent</label>
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
@@ -51,7 +54,7 @@
                                 Now</a>
                             &nbsp;&nbsp;
                             <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                                Copy Link
                             </a>
                             &nbsp;&nbsp;
                         </div>
@@ -69,7 +72,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-400-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -85,10 +88,10 @@
 
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Goto Login Page&nbsp;&nbsp;&nbsp;&nbsp;
+                            Goto Login Page
                         </a>&nbsp;&nbsp;
                         <a href="#" onclick="hidePopup();" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                            Cancel
                         </a>
                     </div>
                 </div>
@@ -104,7 +107,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-403-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -120,7 +123,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-409-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -136,7 +139,7 @@
 
                     <div class="buttons">
                         <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                            OK
                         </a>
                     </div>
                 </div>
@@ -147,35 +150,42 @@
     <br/><br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3><hr>
     <p class="grey margin-top">Get your device ready</p>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</li>
-        <li class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</li>
-        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</li>
+        <li class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the
+            schematic below and get the FireAlarm setup.</li>
+        <li class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the
+            HDMI cable to get a UI view of the device.</li>
+        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet
+            (via Ethernet or Wifi) and note its IP_ADDRESS</li>
     </ul>
     <br>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Schematic Diagram</h3><hr>
     <p class="grey margin-top">Click on the image to zoom</p>
     <center>
         <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
-            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
+            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
         </a>
     </center>
     <br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Connect (Quick Start)</h3><hr>
     <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b></li>
-        <li class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i></li>
-        <li class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></li>
+        <li class="padding-top-double"><span class="circle">01</span> Click on the <i>'Create DEB'</i> button above to
+            get the download link for the FireAlarm setup files</li>
+        <li class="padding-top-double"><span class="circle">02</span> (The following commands can be issued by
+            directly typing into the terminal of the device or by an <b>'ssh'</b> login from a remote PC)</li>
+        <li class="padding-top-double"><span class="circle">03</span> Download the FireAlarm setup files using the
+            following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'.
+            This will download a zip file named 'Agent.zip'</li>
     </ul>
     <br/>
 </div>
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
index 480b174737..5d43391fc6 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
@@ -3,10 +3,10 @@
     <hr>
     <p class="margin-bottom-double light-grey ">Connect your Android device to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
 </div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
     <p class="grey margin-top">Hardware Requirements </p>
@@ -22,7 +22,7 @@
     <br/><br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3><hr>
     <p class="grey margin-top">Get your device ready</p>
     <ul class="list-unstyled">
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index f65f2b6446..9d0faefd3d 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -4,19 +4,19 @@
     <p class="margin-bottom-double light-grey ">Connect your Windows device
         to the WSO2 device cloud.</p>
 </div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/windows-icon.png" class="img-responsive">
 </div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
     <p class="grey margin-top">Hardware Requirements </p>
     <br>
 
     <ul class="list-unstyled">
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+        <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> Windows Mobile</li>
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+        <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i></span> QR Code Scanner App</li>
     </ul>
 
@@ -24,11 +24,11 @@
     <br>
 
     <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}">
-    <i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
+        <i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
     <br/><br/>
 </div>
 
-<div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
+<div class="col-xs-12 col-sm-6 col-md-12 col-lg-12 padding-double">
     <h3 class="uppercase">Connect (Quick Start)</h3><hr>
     <p class="grey margin-top">Quickstart connection</p>
     <br/>