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..70a1144428 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,12 +2,12 @@
     <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>
@@ -47,7 +47,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 +63,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 +82,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 +98,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 +114,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 +125,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>
@@ -140,7 +140,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-6 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>
@@ -184,7 +184,6 @@
                     </div>
                     <div class="buttons" style="padding-bottom: 0px">
                         <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
-                        &nbsp;&nbsp;
                     </div>
                 </form>
             </div>