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 d7ee1f0dc0..fee37a2ee0 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
@@ -154,8 +154,6 @@
 <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">Follow these steps to get your Android Agent to communicate with WSO2
-                               IoT-Server.</p>
     <ul class="list-unstyled">
         <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Connect
                                                                      Android device to network.
@@ -164,20 +162,21 @@
                                                                      Sense app in
                                                                      your device.
         </li>
-        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Fill login
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Fill login
                                                                      form with the
                                                                      credentials.
             <i>(Use server URL as [&nbsp;https://&lt;WSO2_IoT_SERVER_HOST&gt;:&lt;SERVER_PORT&gt;&nbsp;] and click on
-                <strong>Register Device</strong> button.)</i></li>
-        the <strong>Enroll Device</strong> button.)</i>
-
+                <strong>Register Device</strong> button.)</i>
+        </li>
+        <li>
         <a href="{{@unit.publicUri}}/images/registerView.png" target="_blank"
            class="padding-top-double">
             <img src="{{@unit.publicUri}}/images/registerView.png" class="img-responsive">
         </a>
         </li>
 
-        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Once the device is enrolled,
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Once the
+                                                                     device is enrolled,
                                                                      click on <strong>[+]</strong>
                                                                      button to select
                                                                      the sensors.
@@ -186,7 +185,7 @@
                 <img src="{{@unit.publicUri}}/images/selectSensorView.png" class="img-responsive">
             </a>
         </li>
-        <li class="padding-top-double"><span class="circle">06</span>&nbsp;&nbsp;&nbsp;Click on <i>[Publish
+        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Click on <i>[Publish
                                                                                                    data]</i>
                                                                      button
                                                                      to publish sensor readings to
@@ -203,8 +202,6 @@
 <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Try Out</h3>
     <hr>
-    <p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of your
-                               device.</p>
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="fw-stack fw-lg margin-right">
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 125233c131..d324ae9599 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
@@ -8,7 +8,9 @@
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino" target="_blank">[ here ]</a> for latest instructions and trouble shooting</h4>
+    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino"
+                                  target="_blank">[ here ]</a> for latest instructions and trouble
+                         shooting.</h4>
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
@@ -34,8 +36,8 @@
                                                                                  will use the one on
                                                                                  the board.)</i>
         </li>
-        <li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;A
-                                                                          resister( e.g 330 ohms )
+        <li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;Resister(
+                                                                          e.g 330 ohms )
         </li>
         <li class="padding-top-double"><span class="circle">STEP 05</span>&nbsp;&nbsp;&nbsp;Proceed
                                                                           to [Prepare]
@@ -230,8 +232,6 @@
     <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 padding-double">
         <h3 class="uppercase">Try Out</h3>
         <hr>
-        <p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of
-                                   your device</p>
         <ul class="list-unstyled">
             <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can
                                                                          view all your connected
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 ab100c2c8b..99d7db07e0 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
@@ -209,8 +209,6 @@
 <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <h3 class="uppercase">Try Out</h3>
     <hr>
-    <p class="grey margin-top">WSO2-IoT Server enables you to connect and control your
-                               Digital-Display</p>
     <ul class="list-unstyled">
         <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view
                                                                      all your connected