diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
index df8584d79..24e012f73 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
@@ -34,6 +34,14 @@
     <p class="grey margin-top">Connect an Android device to WSO2 IoT Server and visualize sensor
                                data.</p>
     <br>
+    <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
+    <a href="#" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
+    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
+
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android+Sense"
+                                 target="_blank">[ here ]</a> for latest instructions and
+        troubleshooting.</p>
+
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <p class="grey margin-top">You should have an Android Device to get started.</p>
@@ -54,12 +62,8 @@
                Proceed to [Prepare] section.
     </ul>
     <br>
-    <a href="#" class="download-link btn-operations">
-        <i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
-    <br/><br/>
-    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android+Sense"
-                                  target="_blank">[ here ]</a> for latest instructions and
-        troubleshooting.</p>
+
+
 
     <div id="device-400-content" class="hide">
         <div class="modal-content">
@@ -279,6 +283,8 @@
     </div>
 </div>
 
+{{unit "cdmf.unit.device.type.email.invite-modal" deviceTypeView="androidSense"}}
+
 
 <!--<div class="content">-->
 <!--<div class="row">-->
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
index fbaac24cb..e02a2a778 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
@@ -17,6 +17,13 @@
     <p class="grey margin-top">Connect and manage your Android device with WSO2 IoT Server.</p>
     <br>
 
+    <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
+    <a href="#" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
+    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
+
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android"
+                                 target="_blank">here</a> for latest instructions and troubleshooting.</p>
+
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
@@ -31,10 +38,7 @@
         </li>
     </ul>
     <br>
-    <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
-    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android"
-                                 target="_blank">here</a> for latest instructions and troubleshooting.</p>
-    <br/><br/>
+
 </div>
 
 <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
@@ -59,6 +63,8 @@
 
 <br/>
 
+{{unit "cdmf.unit.device.type.email.invite-modal" deviceTypeView="android"}}
+
 {{#zone "topCss"}}
     {{css "css/styles.css"}}
 {{/zone}}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index a35375318..622ce28b9 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -5,18 +5,22 @@
     <h1 class="grey ">Windows Mobile</h1>
     <hr>
 </div>
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/windows-icon.png" class="img-responsive">
 </div>
 
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
 
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect and manage your Windows device with WSO2 IoT Server.</p>
     <br>
 
+    <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
+    <a href="#" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
+    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
+
     <h3 class="uppercase"> Configure your workplace account</h3>
     <hr>
     <ul class="list-unstyled">
@@ -53,6 +57,8 @@
 
 <br/>
 
+{{unit "cdmf.unit.device.type.email.invite-modal"}}
+
 {{#zone "topCss"}}
     {{css "css/styles.css"}}
 {{/zone}}