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/public/images/myDevices_analytics.png 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/public/images/myDevices_analytics.png
new file mode 100644
index 0000000000..2fd8075ff4
Binary files /dev/null and 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/public/images/myDevices_analytics.png differ
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 3e59b2e7b9..ffd54cd6e6 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
@@ -1,24 +1,35 @@
 <div class="col-lg-12  margin-top-double">
     <h1 class="grey ">Android Sense</h1>
     <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Android device
-        to the WSO2 device cloud.</p>
+    <p class="margin-bottom-double light-grey ">Connect your Android device to the WSO2 IoT Server.</p>
 </div>
+
 <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-8 col-md-8 col-lg-8 padding-top">
-    <h3 class="uppercase">Ingredients</h3>
+
+    <h3 class="uppercase">What You Need</h3>
     <hr>
-    <p class="grey margin-top">Hardware Requirements </p>
-    <br>
+    <p class="grey margin-top">You've got to just have an Android Device to get started.</p>
     <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> Android device</li>
-
+        <li class="padding-top-double"><span class="circle">STEP 01</span>&nbsp;&nbsp;&nbsp;Go ahead and click [Enroll
+                                                                          Device].
+        </li>
+        <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;You can either scan the QR
+                                                                          code or direct download to get our
+                                                                          Android-App.
+        </li>
+        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Install our Android-App into
+                                                                          your Android Device.
+        </li>
+        <li class="padding-top-double"><span class="circle">STEP 04</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
+                                                                          section.
     </ul>
-
     <br>
+
+
     <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>
@@ -126,47 +137,75 @@
     <br/><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/>
+    <p class="grey margin-top">Follow the steps to get your Android Agent to communicate with the WSO2 IoT-Server.</p>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Download the agent apk</li>
-
-        <li class="padding-top-double"><span class="circle">02</span> Install the app in your Android device.</li>
-
-
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Connect the Android device to the
+                                                                     network.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Start the Android Sense app in
+                                                                     your device.
+        </li>
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Fill the 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
+               the <strong>Enroll Device</strong> button.)</i></li>
+        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;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>&nbsp;&nbsp;&nbsp;Click on the <i>[Publish
+                                                                                                       data]</i> button
+                                                                     to publish the sensor readings to the IoT server.
+        </li>
     </ul>
     <br>
 </div>
 
-<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double">
-    <h3 class="uppercase">Connect (Quick Start)</h3>
+<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">Internet of Things Foundation Quickstart connection</p>
-    <br/>
+    <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> Start the IOT server</li>
-
-        <li class="padding-top-double"><span class="circle">02</span> Connect the device to the network</li>
-
-        <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="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;You can view all your created devices at our <a href="{{@app.context}}/devices">[Device
+                                                                                                              Management]</a>
+            page.
+        </li>
+        <li class="padding-top-double">
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;You can select any of your created devices here and check for available operations and
+            monitor Real-Time data.
+        </li>
+        <li class="padding-top-double">
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>&nbsp;&nbsp;&nbsp;You can also view "Analytics" of the data published to the IoT-Server by navigating
+                   to the [Device-Analytics Page] from here.
+        </li>
+    </ul>
+    <br/>
 
-        <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>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+        </a>
+    </center>
 
-        <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>
 
-</div>
 
 <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
 
@@ -174,7 +213,9 @@
         <div class="row">
             <div class="col-lg-5 col-md-6 col-centered">
                 <h3>Scan QR code to start enrollment</h3>
+
                 <p>Please scan the QR code using your mobile device to retrieve enrollment URL.</p>
+
                 <div class="panel panel-default">
                     <div class="panel-body col-centered">
                         <div class="qr-code"></div>
@@ -184,7 +225,7 @@
                     <div class="control-group">
                         <div class="controls">
                             <input type="hidden" class="deviceType" name="deviceType" value="android_sense"/>
-                            <input type="hidden" class="sketchType" name="sketchType" value="android_sense" />
+                            <input type="hidden" class="sketchType" name="sketchType" value="android_sense"/>
                         </div>
                     </div>
                     <div class="buttons" style="padding-bottom: 0px">
@@ -245,11 +286,11 @@
     {{js "/js/download.js"}}
     <script type="text/javascript">
 
-        $(".download-link").click(function(){
+        $(".download-link").click(function () {
             toggleEnrollment();
         });
 
-        function toggleEnrollment(){
+        function toggleEnrollment() {
             $(".modalpopup-content").html($("#qr-code-modal").html());
             generateQRCode(".modalpopup-content .qr-code");
             showPopup();
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/public/images/myDevices_analytics.png 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/public/images/myDevices_analytics.png
new file mode 100644
index 0000000000..2fd8075ff4
Binary files /dev/null and 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/public/images/myDevices_analytics.png differ
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 2cad5a6cba..0c04c1ed23 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
@@ -1,180 +1,217 @@
-<div>
-    <div class="col-lg-12  margin-top-double">
-        <h1 class="grey ">Arduino</h1>
-        <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-4 col-md-4 col-lg-4 padding-top">
-        <img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive">
-    </div>
+<div class="col-lg-12  margin-top-double">
+    <h1 class="grey ">Arduino</h1>
+    <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-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 (Internet Enabled)
-            </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> DHT11 Temperature Sensor
-            </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> LED
-            </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> 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</a>
-        <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
-
-        <div id="download-device-modal-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7  center-container">
-                        <h3>Name your device and download the agent from following link.</h3>
-                        <br/>
-
-                        <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
-                            <div class="control-group">
-                                <div class="controls">
-                                    <input class="new-device-name" style="color:#3f3f3f;padding:5px"
-                                           type="text"
-                                           placeholder="Ex. Home_Arduino"
-                                           name="deviceName" size="60" required>
-                                    <br/><br/>
-                                    <input type="hidden" class="deviceType" name="deviceType"
-                                           value="{{@uriParams.deviceType}}"/>
-                                    <input type="hidden" class="sketchType" name="sketchType"
-                                           value="{{@uriParams.deviceType}}"/> &nbsp;&nbsp;
-                                </div>
-                            </div>
-                            <div class="buttons" style="padding-bottom: 0px">
-                                <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                    Now</a>
-                                &nbsp;&nbsp;
-                                <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                    Copy Link
-                                </a>
+<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-8 col-md-8 col-lg-8 padding-top">
+
+    <h3 class="uppercase">What You Need</h3>
+    <hr>
+    <p class="grey margin-top">You'll need the following "Hardware":</p>
+    <ul class="list-unstyled">
+        <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Arduino UNO Board.
+        </li>
+        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit Wifi-Sheild for
+                                                                          Arduino.
+        </li>
+        <li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;An LED Bulb connected to Pin
+                                                                          13. <i>(If not available, will use the one on
+                                                                                 the board.)</i>
+        </li>
+        <li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></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</a>
+    <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download Sketch</a>
+
+    <div id="download-device-modal-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7  center-container">
+                    <h3>Name your device and download the agent from following link.</h3>
+                    <br/>
+
+                    <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
+                        <div class="control-group">
+                            <div class="controls">
+                                <input class="new-device-name" style="color:#3f3f3f;padding:5px"
+                                       type="text"
+                                       placeholder="Ex. Home_Arduino"
+                                       name="deviceName" size="60" required>
+                                <br/><br/>
+                                <input type="hidden" class="deviceType" name="deviceType"
+                                       value="{{@uriParams.deviceType}}"/>
+                                <input type="hidden" class="sketchType" name="sketchType"
+                                       value="{{@uriParams.deviceType}}"/> &nbsp;&nbsp;
                             </div>
-                        </form>
-                    </div>
+                        </div>
+                        <div class="buttons" style="padding-bottom: 0px">
+                            <a class="btn btn-operations" onclick="downloadAgent()">
+                                Download Now
+                            </a>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
+    </div>
 
-        <div id="device-400-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7 col-centered center-container">
-                        <h3>Exception at backend. Try Later.</h3>
+    <div id="device-400-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>Exception at backend. Try Later.</h3>
 
-                        <div class="buttons">
-                            <a href="#" id="device-400-link" class="btn-operations">
-                                OK
-                            </a>
-                        </div>
+                    <div class="buttons">
+                        <a href="#" id="device-400-link" class="btn-operations">
+                            OK
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 
-        <div id="device-401-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7 col-centered center-container">
-                        <h3>You have to log in first.</h3><br/>
-
-                        <div class="buttons">
-                            <a href="#" id="device-401-link" class="blue-button">
-                                Goto Login Page
-                            </a>&nbsp;&nbsp;
-                            <a href="#" onclick="hidePopup();" class="btn-operations">
-                                Cancel
-                            </a>
-                        </div>
+    <div id="device-401-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>You have to log in first.</h3><br/>
+
+                    <div class="buttons">
+                        <a href="#" id="device-401-link" class="blue-button">
+                            Goto Login Page
+                        </a>&nbsp;&nbsp;
+                        <a href="#" onclick="hidePopup();" class="btn-operations">
+                            Cancel
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 
-        <div id="device-403-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7 col-centered center-container">
-                        <h3>Action not permitted.</h3><br/>
+    <div id="device-403-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>Action not permitted.</h3><br/>
 
-                        <div class="buttons">
-                            <a href="#" id="device-403-link" class="btn-operations">
-                                OK
-                            </a>
-                        </div>
+                    <div class="buttons">
+                        <a href="#" id="device-403-link" class="btn-operations">
+                            OK
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 
-        <div id="device-409-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7 col-centered center-container">
-                        <h3>Device Sketch does not exist.</h3><br/>
+    <div id="device-409-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>Device Sketch does not exist.</h3><br/>
 
-                        <div class="buttons">
-                            <a href="#" id="device-409-link" class="btn-operations">
-                                OK
-                            </a>
-                        </div>
+                    <div class="buttons">
+                        <a href="#" id="device-409-link" class="btn-operations">
+                            OK
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 
-        <div id="device-unexpected-error-content" class="hide">
-            <div class="modal-content">
-                <div class="row">
-                    <div class="col-md-7 col-centered center-container">
-                        <h3>Unexpected error.</h3><br/>
+    <div id="device-unexpected-error-content" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>Unexpected error.</h3><br/>
 
-                        <div class="buttons">
-                            <a href="#" id="device-unexpected-error-link" class="btn-operations">
-                                OK
-                            </a>
-                        </div>
+                    <div class="buttons">
+                        <a href="#" id="device-unexpected-error-link" class="btn-operations">
+                            OK
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
-
-        <br/><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> Get your Arduino device and download the Agent
-                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.
-            </li>
-            <li class="padding-top-double"><span class="circle">03</span> Burn the sketch onto your Arduino board and
-                let the program run.
-            </li>
-        </ul>
-        <br>
-    </div>
+    <br/><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 the Wifi-Sheild mounted onto the Arduino-UNO board and follow the steps: </p>
+    <ul class="list-unstyled">
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Download the Arduino-Sketch from
+                                                                     the [Download] link above.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Unzip the downloaded
+                                                                     Arduino-Sketch and open the <i>"ArduinoBoardSketch.h"</i>
+                                                                     file.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Provide appropriate values for
+            <i>[WLAN_SSID]</i> and <i>[WLAN_PASS]</i> variables according to your network.
+        </li>
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Burn the sketch onto your Arduino
+                                                                     board and let the program run.
+        </li>
+
+        <li class="padding-top-double">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;The Arduino will publish its internal temperature to the WSO2-IoT-Server and its LED on
+            <i>PIN 13</i> can be controlled from our Device Management page.
+        </li>
+    </ul>
+    <br>
+</div>
+
+<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="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your created
+                                                                     devices at our <a href="{{@app.context}}/devices">[Device
+                                                                                                                       Management]</a>
+                                                                     page.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;You can select any of your
+                                                                     created devices here and check for available
+                                                                     operations and monitor Real-Time data.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view "Analytics" of
+                                                                     the data published to the IoT-Server by navigating
+                                                                     to the [Device-Analytics Page] from here.
+        </li>
+    </ul>
+    <br/>
+
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+        </a>
+    </center>
+
+</div>
+
+
 {{#zone "topCss"}}
     <style type="text/css">
         .circle {
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/public/images/myDevices_analytics.png 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/public/images/myDevices_analytics.png
new file mode 100644
index 0000000000..2fd8075ff4
Binary files /dev/null and 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/public/images/myDevices_analytics.png differ
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 73d0e4527e..75f6a2a0f8 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,47 +1,37 @@
 <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>
+    <p class="margin-bottom-double light-grey ">Connect your Digital Display to the WSO2 IoT Server.</p>
 </div>
+
 <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-8 col-md-8 col-lg-8 padding-top">
-    <h3 class="uppercase">Ingredients</h3>
+
+    <h3 class="uppercase">What You Need</h3>
     <hr>
-    <p class="grey margin-top">Hardware Requirements </p>
-    <br>
+    <p class="grey margin-top">You'll need the following "Hardware":</p>
     <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
-        </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
+        <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Raspberry Pi Board (Internet
+                                                                          Enabled [Wifi or Ethernet]).
         </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
+        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;A Digital Display with HDMI
+                                                                          Cable.
         </li>
+        <li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></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>
-    <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
+    <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download Agent</a>
 
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
             <div class="row">
-                <div class="col-md-7  center-container">
+                <div class="col-md-7 center-container">
                     <h3>Name your device and download the agent from following link.</h3>
                     <br/>
 
@@ -49,24 +39,18 @@
                         <div class="control-group">
                             <div class="controls">
                                 <input class="new-device-name" style="color:#3f3f3f;padding:5px"
-                                       type="text"
-                                       placeholder="Ex. Lobby_DigitalDisplay"
+                                       type="text" placeholder="Ex. Lobby_DigitalDisplay"
                                        name="deviceName" size="60" required>
-                                <br/><br/>
-                                <input type="hidden" class="deviceType" name="deviceType"
-                                       value="digital_display"/>
-                                <input type="hidden" class="sketchType" name="sketchType"
-                                       value="digital_display"/>
+                                <br/>
+                                <br/>
+                                <input type="hidden" class="deviceType" name="deviceType" value="digital_display"/>
+                                <input type="hidden" class="sketchType" name="sketchType" value="digital_display"/>
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
-                            <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                Now</a>
-                            &nbsp;&nbsp;
-                            <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                Copy Link
-                            </a>
-                            &nbsp;&nbsp;
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a> &nbsp;&nbsp;
+                            <a href="#" id="download-device-download-link" class="btn btn-operations"> Copy Link </a>
+                                                                                                     &nbsp;&nbsp;
                         </div>
                     </form>
                 </div>
@@ -74,6 +58,21 @@
         </div>
     </div>
 
+    <div id="download-device-modal-content-links" class="hide">
+        <div class="modal-content">
+            <div class="row">
+                <div class="col-md-7 col-centered center-container">
+                    <h3>Please download the file from following link(Press CTRL+C).</h3>
+                    <br/>
+
+                    <div>
+                        <input id="download-device-url" style="color:#3f3f3f;padding:5px"
+                               type="text" value="" placeholder="Type here" size="60">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 
     <div id="device-400-content" class="hide">
         <div class="modal-content">
@@ -162,22 +161,26 @@
 </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/>
+    <h3 class="uppercase">Prepare</h3>
+    <hr>
+    <p class="grey margin-top">Follow the steps to get your Digital-Display up &amp; running and communicating to the
+                               WSO2 IoT-Server.</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 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>
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Connect a monitor to your
+                                                                     RaspberryPi via the HDMI cable to get the
+                                                                     Graphical-User-Interface of the RaspberryPi board.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Setup the RaspberryPi to connect
+                                                                     to the internet (via Ethernet or Wifi) and
+                                                                     note-down its <i>IP_ADDRESS</i>.
+        </li>
     </ul>
     <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>
+    <h3 class="uppercase">Digital-Display Setup</h3>
+    <hr>
     <p class="grey margin-top">Click on the image to zoom</p>
     <center>
         <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
@@ -188,82 +191,77 @@
 </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/>
+    <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>
-            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 class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your created
+                                                                     devices at our <a href="{{@app.context}}/devices">[Device
+                                                                                                                       Management]</a>
+                                                                     page.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;You can select any of your
+                                                                     created devices here and check for available
+                                                                     operations and monitor Real-Time data.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view "Analytics" of
+                                                                     the data published to the IoT-Server by navigating
+                                                                     to the [Device-Analytics Page] from here.
         </li>
     </ul>
-    <br>
-</div>
+    <br/>
 
-</div>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+        </a>
+    </center>
 
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" class="hidden">
-
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>
-                    Scan QR code to start enrollment
-                </h3>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
 
 <style type="text/css">
     .circle {
-    background: none repeat scroll 0 0 #191919;
-    border-radius: 50px;
-    height: 50px;
-    padding: 10px;
-    width: 50px;
-    color: #fff;
+        background: none repeat scroll 0 0 #191919;
+        border-radius: 50px;
+        height: 50px;
+        padding: 10px;
+        width: 50px;
+        color: #fff;
     }
+
     .padding-top-double {
-    padding-top: 20px;
+        padding-top: 20px;
     }
+
     .padding-double {
-    padding: 20px;
+        padding: 20px;
     }
+
     .grey {
-    color: #333;
+        color: #333;
     }
+
     hr {
-    display: block;
-    height: 1px;
-    border: 0;
-    border-top: 1px solid #7f7f7f;
-    margin: 1em 0;
-    padding: 0;
-    opacity: 0.2;
+        display: block;
+        height: 1px;
+        border: 0;
+        border-top: 1px solid #7f7f7f;
+        margin: 1em 0;
+        padding: 0;
+        opacity: 0.2;
     }
+
     .light-grey {
-    color: #7c7c7c;
+        color: #7c7c7c;
     }
+
     .uppercase {
-    text-transform: uppercase;
+        text-transform: uppercase;
     }
+
     .grey-bg {
-    background-color: #f6f4f4;
+        background-color: #f6f4f4;
     }
 </style>
 
@@ -271,3 +269,4 @@
     {{js "/js/download.js"}}
     {{js "/js/jquery.validate.js"}}
 {{/zone}}
+
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/public/images/myDevices_analytics.png 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/public/images/myDevices_analytics.png
new file mode 100644
index 0000000000..2fd8075ff4
Binary files /dev/null and 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/public/images/myDevices_analytics.png differ
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 5918371107..725552edbc 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
@@ -1,29 +1,31 @@
 <div class="col-lg-12  margin-top-double">
     <h1 class="grey ">Drone Analyzer</h1>
     <hr>
-    <p class="margin-bottom-double light-grey ">Connect your drone device to the WSO2 device cloud.</p>
+    <p class="margin-bottom-double light-grey ">Connect your Drone to the WSO2 IoT Server.</p>
 </div>
+
 <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-8 col-md-8 col-lg-8 padding-top">
-    <h3 class="uppercase">Ingredients</h3>
+
+    <h3 class="uppercase">What You Need</h3>
     <hr>
-    <p class="grey margin-top">Hardware Requirements </p>
-    <br>
+    <p class="grey margin-top">You'll need the following "Hardware":</p>
     <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> 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>
+        <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Your IRIS+ Drone.
+        </li>
+        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;USB to Micro USB cable or
+                                                                          Telemetry Radio receiver.
+        </li>
+        <li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></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>
-    <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</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 Agent</a>
 
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
@@ -31,6 +33,7 @@
                 <div class="col-md-7  center-container">
                     <h3>Name your device and download the agent from following link.</h3>
                     <br/>
+
                     <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
                         <div class="control-group">
                             <div class="controls">
@@ -46,14 +49,9 @@
                             </div>
                         </div>
                         <br/>
-                        <div class="buttons">
-                            <a class="btn-operations" onclick="downloadAgent()">Download
-                                Now</a>
-                            &nbsp;&nbsp;
-                            <a href="#" id="download-device-download-link" class="blue-button">
-                                Copy Link
-                            </a>
 
+                        <div class="buttons">
+                            <a class="btn-operations" onclick="downloadAgent()">Download Now</a>
                         </div>
                     </form>
                 </div>
@@ -147,94 +145,120 @@
     <br/><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>
+    <h3 class="uppercase">Prepare</h3>
+    <hr>
+    <p class="grey margin-top">Follow the steps to get your drone ready to communicate with the WSO2 IoT Server.</p>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Set up your IRIS+ Drone as shown in the schematic below.</li>
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Connect your IRIS+ Drone as shown
+                                                                     in the schematic below.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Click on the [Download] button
+                                                                     above to get the IRIS+ Drone setup files.
+        </li>
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Connecting the drone:</li>
+
+        <div class="padding-top-double">
+            <table class="table table-bordered ">
+                <thead>
+                <tr>
+                    <th>
+                        <center><i>CONNECTION-TYPE</i></center>
+                    </th>
+                    <th>
+                        <center><i>CONNECTION-STRING</i></center>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>Linux computer connected to the drone via USB</td>
+                    <td>/dev/ttyAMA0 <i>(also set baud=57600)</i></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 <i>(also set baud=57600)</i></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <li class="padding-top-double">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;Once you have the setup files ready please run the <i>"[startservice.sh]"</i> script with
+            root privilege.
+        </li>
+
+        <li class="padding-top-double">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;These connection types may vary from computer to computer. So please provide the correct
+            connection port info.
+        </li>
+
     </ul>
     <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>
+    <h3 class="uppercase">IRIS+ Drone Connected to a machine.</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" >
+            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
         </a>
     </center>
     <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>
+    <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> <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>
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your created
+                                                                     devices at our <a href="{{@app.context}}/devices">[Device
+                                                                                                                       Management]</a>
+                                                                     page.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;You can select any of your
+                                                                     created devices here and check for available
+                                                                     operations and monitor Real-Time data.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view "Analytics" of
+                                                                     the data published to the IoT-Server by navigating
+                                                                     to the [Device-Analytics Page] from here.
         </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>
 
-</div>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+        </a>
+    </center>
 
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" class="hidden">
-
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>
-                    Scan QR code to start enrollment
-                </h3>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
 
-
 {{#zone "topCss"}}
     <style type="text/css">
         .circle {
@@ -245,15 +269,19 @@
             width: 50px;
             color: #fff;
         }
+
         .padding-top-double {
             padding-top: 20px;
         }
+
         .padding-double {
             padding: 20px;
         }
+
         .grey {
             color: #333;
         }
+
         hr {
             display: block;
             height: 1px;
@@ -263,12 +291,15 @@
             padding: 0;
             opacity: 0.2;
         }
+
         .light-grey {
             color: #7c7c7c;
         }
+
         .uppercase {
             text-transform: uppercase;
         }
+
         .grey-bg {
             background-color: #f6f4f4;
         }
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
index 84b616d30a..b094629b97 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
@@ -39,7 +39,7 @@
                 <hr>
                 <button class="wr-btn wizard-stepper" data-current="policy-message"
                         data-direct="{{@app.context}}/policies/">
-                    &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
+                    View policy list
                 </button>
                 <a href="@{{@app.context}}/policies/add-policy" class="cu-btn-inner">
                         <span class="fw-stack">
@@ -91,19 +91,21 @@
                                 <br class="c-both"/>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-lg-12">
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-naming" data-next="policy-criteria">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="#" class="wr-btn wizard-stepper"
                                data-current="policy-naming-publish" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save & Publish&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save & Publish
                             </a>
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming"
                                data-next="policy-message" data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save
                             </a>
 
                         </div>
@@ -129,13 +131,13 @@
                                     <input id="user-roles-radio-btn" type="radio"
                                            name="select-users-radio-btn" class="select-users-radio"
                                            checked/>
-                                    <span class="helper">&nbsp;Set user role(s)</span>
+                                    <span class="helper"> Set user role(s)</span>
                                 </label>
                                 <label class="wr-input-control radio light" rel="assetfilter">
                                     <input id="users-radio-btn" type="radio"
                                            name="select-users-radio-btn"
                                            class="select-users-radio"/>
-                                    <span class="helper">&nbsp;Set user(s)</span>
+                                    <span class="helper"> Set user(s)</span>
                                 </label>
                             </div>
                             <div id="user-roles-select-field" class="select-users">
@@ -185,11 +187,11 @@
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-criteria" data-next="policy-profile">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                               Back
                             </a>
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-criteria"
                                data-next="policy-naming" data-validate="false">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
@@ -224,7 +226,7 @@
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-profile"
                                data-next="policy-criteria" data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
index 5f3040ff2c..ee0be02f1d 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
@@ -45,7 +45,7 @@
                 <hr>
                 <button class="wr-btn wizard-stepper" data-current="policy-message"
                         data-direct="{{@app.context}}/policies">
-                    &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
+                    View policy list
                 </button>
                 <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
                         <span class="fw-stack">
@@ -97,21 +97,23 @@
                                 <br class="c-both"/>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-lg-12">
                         <div class="wr-input-control wr-btn-grp">
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-is-back-btn="true" data-current="policy-naming"
                                data-next="policy-criteria">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-naming-publish" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save & Publish&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save & Publish
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-naming" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save
                             </a>
                         </div>
                     </div>
@@ -189,12 +191,12 @@
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-is-back-btn="true" data-current="policy-criteria"
                                data-next="policy-profile">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-criteria" data-next="policy-naming"
                                data-validate="false">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
@@ -229,12 +231,12 @@
                             <a href="{{@app.context}}/policies/add-policy"
                                class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-profile" data-next="policy-platform">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-profile" data-next="policy-criteria"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                               Continue
                             </a>
                         </div>
                     </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/public/images/myDevices_analytics.png 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/public/images/myDevices_analytics.png
new file mode 100644
index 0000000000..2fd8075ff4
Binary files /dev/null and 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/public/images/myDevices_analytics.png differ
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 d30e896d95..ae3e424aa4 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
@@ -1,31 +1,34 @@
-
 <div class="col-lg-12  margin-top-double">
     <h1 class="grey ">Raspberry Pi</h1>
     <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device to the WSO2 device cloud.</p>
+    <p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device to the WSO2 IoT Server.</p>
 </div>
+
 <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-8 col-md-8 col-lg-8 padding-top">
-    <h3 class="uppercase">Ingredients</h3>
+
+    <h3 class="uppercase">What You Need</h3>
     <hr>
-    <p class="grey margin-top">Hardware Requirements </p>
-    <br>
+    <p class="grey margin-top">You'll need the following "Hardware":</p>
     <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 (Internet Enabled)</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> DHT11 Temperature Sensor</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> LED</li>
+        <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Raspberry Pi Board (Internet
+                                                                          Enabled [Wifi or Ethernet]).
+        </li>
+        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit DHT11 Temperature
+                                                                          Sensor.
+        </li>
+        <li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;An LED Bulb.
+        </li>
+        <li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></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>
-    <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
+       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 Agent</a>
 
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
@@ -33,6 +36,7 @@
                 <div class="col-md-7  center-container">
                     <h3>Name your device and download the agent from following link.</h3>
                     <br/>
+
                     <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
                         <div class="control-group">
                             <div class="controls">
@@ -49,7 +53,7 @@
                         </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">
                                 Copy Link
@@ -148,22 +152,65 @@
     <br/><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>
+    <h3 class="uppercase">Prepare</h3>
+    <hr>
+    <p class="grey margin-top">Our RaspberryPi Agent can be tested on a real RaspberryPi Board or in a virtual environment
+                               (ie: The machine to which the agent was downloaded).</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 Raspberry Pi agent 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 or share your computer monitor with RaspberryPi using SSH.</li>
-        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet
-            (via Ethernet or Wifi)</li>
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Set up your RaspberryPi device as
+                                                                     shown in the schematic below and get the DHT11
+                                                                     Temperature Sensor and the LED connected.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Ensure that your RaspberryPi
+                                                                     Board is internet enabled either via WiFi or
+                                                                     Ethernet.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Download our Raspberry Pi Agent
+                                                                     via the [Download] button above. You can also
+                                                                     generate the [cURL] command to directly download
+                                                                     the Agent to your RaspberryPi.
+        </li>
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Copy the downloaded Agent into
+                                                                     your RaspberryPi board (or directly download it to
+                                                                     the borad via the generated [cURL] command).
+        </li>
+        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Unzip the downloaded Agent and
+                                                                     move into the unzipped Agent folder in the
+                                                                     terminal:
+        </li>
+
+
+        <li class="padding-top-double">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;[sudo ./testAgent.sh] &nbsp;&nbsp; - &nbsp;&nbsp; Script to test whether the agent is
+            working fine. <i>(This script can be run even on the local machine to which the download was made)</i>
+        </li>
+
+        <li class="padding-top-double">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="fw-stack fw-lg margin-right">
+                <i class="fw fw-ring fw-stack-2x"></i>
+                <i class="fw fw-right-arrow fw-stack-1x"></i>
+            </span>
+            &nbsp;&nbsp;&nbsp;[sudo ./startService.sh] &nbsp;&nbsp; - &nbsp;&nbsp; After testing, this script can be
+            used to start and deploy this agent as a service on the Raspberry Pi Board. <i>(This registered service will
+                                                                                           be loaded on boot up)</i>
+        </li>
+
+
     </ul>
     <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>
+    <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">
@@ -174,50 +221,35 @@
 </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>
+    <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> Click on the <i>'Download'</i> button above to
-            get the download link for the Raspberry Pi setup files</li>
-        <li class="padding-top-double"><span class="circle">02</span> <b>testAgent.sh</b>: This script is used to run
-            this service in a testing environment. It can be run on a real Raspberry Pi device or in a
-            virtual environment.<br>To run: sudo ./testAgent.sh and follow the instructions.</li>
-        <li class="padding-top-double"><span class="circle">03</span> <b>startService.sh</b>: After testing, this script
-            can be used to deploy this application as a service on Raspberry Pi which will get loaded during boot up
-            process.<br>To run: sudo ./startService.sh. <br>Note: You should have to provide following arguments in
-            RaspberryService.sh as shown below. <br>DAEMON_OPTS="-l /usr/local/src/RaspberryAgent/RaspberryStats.log -m N
-            -i 100". <br>Here -l stands for the absolute path for a file which will be using for logging. -i stands for the
-            time interval between successive data pushes to the wso2 IoT Server and finally -m is used to check where to
-            run this application. Weather is going to run on the real device or not.
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your created
+                                                                     devices at our <a href="{{@app.context}}/devices">[Device
+                                                                                                                       Management]</a>
+                                                                     page.
+        </li>
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;You can select any of your
+                                                                     created devices here and check for available
+                                                                     operations and monitor Real-Time data.
+        </li>
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view "Analytics" of
+                                                                     the data published to the IoT-Server by navigating
+                                                                     to the [Device-Analytics Page] from here.
+        </li>
     </ul>
     <br/>
-</div>
 
-</div>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+        </a>
+    </center>
 
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" class="hidden">
-
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>
-                    Scan QR code to start enrollment
-                </h3>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
 
-
 {{#zone "topCss"}}
     <style type="text/css">
         .circle {
@@ -228,15 +260,19 @@
             width: 50px;
             color: #fff;
         }
+
         .padding-top-double {
             padding-top: 20px;
         }
+
         .padding-double {
             padding: 20px;
         }
+
         .grey {
             color: #333;
         }
+
         hr {
             display: block;
             height: 1px;
@@ -246,12 +282,15 @@
             padding: 0;
             opacity: 0.2;
         }
+
         .light-grey {
             color: #7c7c7c;
         }
+
         .uppercase {
             text-transform: uppercase;
         }
+
         .grey-bg {
             background-color: #f6f4f4;
         }
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 1b9929b55d..1feb61b270 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
@@ -4,6 +4,7 @@
     <p class="margin-bottom-double light-grey ">Use our Virtual Instance of a FireAlarm and connect to the WSO2-IoT
                                                 Server.</p>
 </div>
+
 <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>
@@ -19,7 +20,7 @@
         <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
                                                                           section.
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Read thh [Try Out] section
+        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Read the [Try Out] section
                                                                           to further experiment with the device.
         </li>
         <li><br></br></li>
@@ -167,7 +168,7 @@
         <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Move into the unzipped Agent
                                                                      folder in the terminal.
         </li>
-        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Start your Agent by running the
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Start your Agent by running the
                                                                      startup script via the command: [sh startup.sh]
         </li>
     </ul>
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
index d39702986f..305f773a49 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
@@ -133,7 +133,7 @@
                                     <classpath refid="maven.compile.classpath"/>
                                     <classpath refid="maven.runtime.classpath"/>
 
-                                    <fileset file="${basedir}/src/main/resources/dbscripts/h2.sql"/>
+                                    <fileset file="${basedir}/src/main/resources/dbscripts/plugins/h2.sql"/>
                                 </sql>
                                 <echo message="##################### END ####################"/>
                             </tasks>