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 f6af817ef..8649dd61a 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
@@ -4,7 +4,7 @@
 
 <div class="row">
     <div class="col-lg-12">
-        <h1 class="grey ">Android Mobile Device Enrollment</h1>
+        <h1 class="grey ">DOWNLOAD THE ANDROID AGENT</h1>
         <hr>
     </div>
 </div>
@@ -14,11 +14,12 @@
         <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
     </div>-->
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 add-padding-top-2x">
-        <h3 class="text-center">Scan to connect your device</h3>
+        <h3 class="text-center">Scan to download the Android Agent.</h3>
         <div class="enrollment-qr-container text-center"></div>
         <h3 class="text-center add-margin-bottom-2x add-margin-top-2x">or</h3>
-        <div class="text-center"><a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk"
-                                    class="btn-operations remove-margin download_agent">
+        <div class="text-center"><a
+                href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk"
+                class="btn-operations remove-margin download_agent">
             <i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a></div>
 
         <!--<p class="doc-link">Please scan the QR code to download the APK on to your android device or click
@@ -26,40 +27,72 @@
             to save it to your computer.</p>
         <p class="doc-link">For further instructions and troubleshooting please visit the following <a href="https://docs.wso2.com/display/IoTS300/Android"
                                      target="_blank">link</a>.</p>-->
-        <p class="doc-link text-center">For further instructions & troubleshooting go <a href="https://docs.wso2.com/display/IoTS300/Android" target="_blank">here</a></p>
+        <p class="doc-link text-center">Need help? Read <a
+                href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" target="_blank">WSO2 Device
+            Cloud documentation.</a></p>
     </div>
 </div>
 
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 add-padding-top-2x ">
-        <h3 class="uppercase">To enroll your device</h3><hr>
+        <h3 class="uppercase">START ENROLLING YOUR DEVICE</h3>
+        <hr>
     </div>
 </div>
 
 <div class="row grey-bg">
+    {{#if isCloud}}
+    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 add-padding-top-2x add-padding-bottom-2x">
+    {{else}}
     <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5><strong>Step 1</strong></h5>
-        <p>Install the downloaded application in to the device to proceed.</p>
-        <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
-    </div>
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5><strong>Step 2</strong></h5>
-        <p>Tap Skip to proceed with the default enrollment process.</p>
-        <img src="{{@unit.publicUri}}/images/set_profile.png" class="img-responsive">
-    </div>
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5><strong>Step 3</strong></h5>
-        <p>Enter the server address based on your environment, in the text box provided.</p>
-        <img src="{{@unit.publicUri}}/images/registration.png" class="img-responsive">
-    </div>
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5><strong>Step 4</strong></h5>
-        <p>Enter your credentials on to the provided fields and tap Register. </p>
-        <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
-    </div>
+    {{/if}}
+
+
+    <h5><strong>Step 1</strong></h5>
+    <p>Let's start by installing the Android agent on your device. Open the downloaded file, and tap <b>INSTALL</b>.</p>
+    <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
 </div>
 
-<!--<div class="row">
+    {{#if isCloud}}
+        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 add-padding-top-2x add-padding-bottom-2x">
+            <h5><strong>Step 2</strong></h5>
+            <p>Enter your:
+            <p>
+            <ul>
+                <li>Username: username/email that you used to sign in.</li>
+                <li>Password: the WSO2 Cloud password.</li>
+                <li>Organization: the name of the organization.</li>
+            </ul>
+            <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+        </div>
+    {{else}}
+
+        <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+            <h5><strong>Step 2</strong></h5>
+            <p>Tap Skip to proceed with the default enrollment process.</p>
+            <img src="{{@unit.publicUri}}/images/set_profile.png" class="img-responsive">
+        </div>
+        <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+            <h5><strong>Step 3</strong></h5>
+            <p>Enter the server address based on your environment, in the text box provided.</p>
+            <img src="{{@unit.publicUri}}/images/registration.png" class="img-responsive">
+        </div>
+        <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+            <h5><strong>Step 4</strong></h5>
+            <p>Enter your:
+            <p>
+            <ul>
+                <li>Username: username/email that you used to sign in to IoT server.</li>
+                <li>Password: the WSO2 Iot server password.</li>
+                <li>Domain: the name of the domain.</li>
+            </ul>
+            <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+        </div>
+    {{/if}}
+
+</div>
+
+    <!--<div class="row">
     <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double ">
         <h3 class="uppercase">What You Need</h3>
         <hr>
@@ -107,7 +140,7 @@
 
 </div>-->
 
-<!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+    <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <p class="grey margin-top">Click on the image to zoom</p>
     <center>
         <a href="{{@unit.publicUri}}/images/android_device.png" target="_blank">
@@ -116,12 +149,12 @@
     </center>
 </div>-->
 
-<br/>
+    <br/>
 
-{{#zone "topCss"}}
-    {{css "css/styles.css"}}
-{{/zone}}
+    {{#zone "topCss"}}
+        {{css "css/styles.css"}}
+    {{/zone}}
 
-{{#zone "bottomJs"}}
-    {{js "js/type-view.js"}}
-{{/zone}}
+    {{#zone "bottomJs"}}
+        {{js "js/type-view.js"}}
+    {{/zone}}