diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/public/js/platform-configuration.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/public/js/platform-configuration.js
index 4ad5d5341..a179701e5 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/public/js/platform-configuration.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/public/js/platform-configuration.js
@@ -227,11 +227,8 @@ $(document).ready(function () {
                 addConfigAPI,
                 addConfigFormData,
                 function (data, textStatus, jqXHR) {
-                    data = JSON.parse(data);
-                    if (jqXHR.status == 201) {
-                        $("#config-save-form").addClass("hidden");
-                        $("#record-created-msg").removeClass("hidden");
-                    }
+                    $("#config-save-form").addClass("hidden");
+                    $("#record-created-msg").removeClass("hidden");
 
                 }, function (data) {
                     if (data.status == 500) {
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
index f56ba9556..dd53bc04e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
@@ -185,17 +185,17 @@ var InitiateViewOption = null;
                             $("#applications-list-container").html(content);
                         } else {
                             $("#applications-list-container").
-                                html("<div class='message message-info'><h4><i class='icon fw fw-info'></i>No applications found.</h4>" +
-                                    "<p>Please try refreshing the list in a while.</p></div>");
+                            html("<div class='message message-info'><h4><i class='icon fw fw-info'></i>No applications found.</h4>" +
+                                "<p>Please try refreshing the list in a while.</p></div>");
                         }
                     }
                 },
                 // error-callback
                 function () {
                     $("#applications-list-container").
-                        html("<div class='panel-body'><br><p class='fw-warning'>&nbsp;Loading application list " +
-                            "was not successful. please try refreshing the list in a while.<p></div>");
-            });
+                    html("<div class='panel-body'><br><p class='fw-warning'>&nbsp;Loading application list " +
+                        "was not successful. please try refreshing the list in a while.<p></div>");
+                });
         });
     }
 
@@ -251,50 +251,50 @@ var InitiateViewOption = null;
                                     // error-callback
                                     function () {
                                         $("#policy-list-container").
-                                            html("<div class='message message-warning'>" +
-                                                    "<h4 class='remove-margin'>" +
-                                                        "<i class='icon fw fw-warning'></i>" +
-                                                        "Loading policy compliance related data " +
-                                                        "was not successful. please try refreshing in a while." +
-                                                    "</h4>" +
-                                                "</div>" +
-                                                "<p class='add-padding-5x'></p>" +
-                                                "<p class='add-padding-5x'></p>" +
-                                                "<p class='add-padding-5x'></p>"
-                                            );
+                                        html("<div class='message message-warning'>" +
+                                            "<h4 class='remove-margin'>" +
+                                            "<i class='icon fw fw-warning'></i>" +
+                                            "Loading policy compliance related data " +
+                                            "was not successful. please try refreshing in a while." +
+                                            "</h4>" +
+                                            "</div>" +
+                                            "<p class='add-padding-5x'></p>" +
+                                            "<p class='add-padding-5x'></p>" +
+                                            "<p class='add-padding-5x'></p>"
+                                        );
                                     }
                                 );
                             }
                         } else if ((jqXHR.status == 200 && !data)) {
                             $("#policy-spinner").addClass("hidden");
                             $("#policy-list-container").
-                                html("<div class='message message-info'>" +
-                                        "<h4 class='remove-margin'>" +
-                                            "<i class='icon fw fw-info'></i>" +
-                                                "There is currently no effective policy applied for this device." +
-                                        "</h4>" +
-                                    "</div>" +
-                                    "<p class='add-padding-5x'></p>" +
-                                    "<p class='add-padding-5x'></p>" +
-                                    "<p class='add-padding-5x'></p>"
-                                );
+                            html("<div class='message message-info'>" +
+                                "<h4 class='remove-margin'>" +
+                                "<i class='icon fw fw-info'></i>" +
+                                "There is currently no effective policy applied for this device." +
+                                "</h4>" +
+                                "</div>" +
+                                "<p class='add-padding-5x'></p>" +
+                                "<p class='add-padding-5x'></p>" +
+                                "<p class='add-padding-5x'></p>"
+                            );
                         }
                     },
                     // error-callback
                     function () {
                         $("#policy-spinner").addClass("hidden");
                         $("#policy-list-container").
-                            html("<div class='message message-warning'>" +
-                                    "<h4 class='remove-margin'>" +
-                                        "<i class='icon fw fw-warning'></i>" +
-                                        "Loading policy compliance related data " +
-                                        "was not successful. please try refreshing in a while." +
-                                    "</h4>" +
-                                "</div>" +
-                                "<p class='add-padding-5x'></p>" +
-                                "<p class='add-padding-5x'></p>" +
-                                "<p class='add-padding-5x'></p>"
-                            );
+                        html("<div class='message message-warning'>" +
+                            "<h4 class='remove-margin'>" +
+                            "<i class='icon fw fw-warning'></i>" +
+                            "Loading policy compliance related data " +
+                            "was not successful. please try refreshing in a while." +
+                            "</h4>" +
+                            "</div>" +
+                            "<p class='add-padding-5x'></p>" +
+                            "<p class='add-padding-5x'></p>" +
+                            "<p class='add-padding-5x'></p>"
+                        );
                     }
                 );
             }
@@ -309,6 +309,10 @@ var InitiateViewOption = null;
         loadApplicationsList();
         loadPolicyCompliance();
 
+        if ($("#device_details_tab").length == 0) {
+            $(".device-detail-body").addClass("hidden");
+        }
+
         $("#refresh-policy").click(function () {
             $("#policy-spinner").removeClass("hidden");
             loadPolicyCompliance();
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index d44d94957..5d1470c11 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -6,7 +6,8 @@
     {{#if deviceFound}}
         {{#if isAuthorized}}
             <h1 class="page-sub-title device-id device-select"
-                data-deviceid="{{deviceView.deviceIdentifier}}" data-type="{{deviceView.deviceType}}" data-ownership="{{deviceView.ownership}}">
+                data-deviceid="{{deviceView.deviceIdentifier}}" data-type="{{deviceView.deviceType}}"
+                data-ownership="{{deviceView.ownership}}">
                 Device {{deviceView.name}}
                 {{#if deviceView.model}}
                     <span class="lbl-device">
@@ -15,413 +16,463 @@
                 {{/if}}
             </h1>
             <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
-            <div class="media">
-                <div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
-                    <div class="thumbnail icon"><i class="square-element text fw fw-mobile"></i></div>
-                </div>
-                <div class="media-body asset-desc add-padding-left-5x">
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device Overview</div>
-                    {{#defineZone "device-detail-properties"}}
-                        <table class="table table-responsive table-striped" id="members">
-                            <tbody>
-                            {{#if deviceView.deviceIdentifier}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
-                                    <td style="padding:10px 15px;">{{deviceView.deviceIdentifier}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.name}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
-                                    <td style="padding:10px 15px;">{{deviceView.name}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.vendor}}
-                                {{#if deviceView.model}}
+                <div class="media">
+                    <div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
+                        <div class="thumbnail icon"><i class="square-element text fw fw-mobile"></i></div>
+                    </div>
+                    <div class="media-body asset-desc add-padding-left-5x">
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
+                            Overview
+                        </div>
+                        {{#defineZone "device-detail-properties"}}
+                            <table class="table table-responsive table-striped" id="members">
+                                <tbody>
+                                {{#if deviceView.deviceIdentifier}}
                                     <tr role="row" class="odd">
-                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
-                                        <td style="padding:10px 15px;">{{deviceView.vendor}} {{deviceView.model}}</td>
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
+                                        <td style="padding:10px 15px;">{{deviceView.deviceIdentifier}}</td>
                                     </tr>
                                 {{/if}}
-                            {{/if}}
-                            {{#if deviceView.status}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
-                                    <td style="padding:10px 15px;">
-                                        {{#equal deviceView.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
-                                        {{#equal deviceView.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
-                                        {{#equal deviceView.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
-                                        {{#equal deviceView.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
-                                    </td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.owner}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
-                                    <td style="padding:10px 15px;">{{deviceView.owner}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.ownership}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
-                                    <td style="padding:10px 15px;">{{deviceView.ownership}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.imei}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
-                                    <td style="padding:10px 15px;">{{deviceView.imei}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.udid}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
-                                    <td style="padding:10px 15px;">{{deviceView.udid}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.osBuildDate}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Firmware Build Date</td>
-                                    <td style="padding:10px 15px;">{{deviceView.osBuildDate}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.phoneNumber}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
-                                    <td style="padding:10px 15px;">{{deviceView.phoneNumber}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.lastUpdatedTime}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
-                                    <td style="padding:10px 15px;">{{deviceView.lastUpdatedTime}}</td>
-                                </tr>
-                            {{/if}}
-                            </tbody>
-                        </table>
-                    {{/defineZone}}
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Operations</div>
-                    <div class="add-margin-top-4x">
-                        {{unit "mdm.unit.device.operation-bar" deviceType=deviceView.deviceType ownership=deviceView.ownership}}
-                    </div>
-                </div>
-            </div>
-            <div class="media tab-responsive">
-            <div class="media-left col-xs-1 col-sm-1 col-md-2 col-lg-2 hidden-xs">
-                <ul class="list-group nav nav-pills nav-stacked" role="tablist">
-                    <li role="presentation" class="list-group-item active">
-                        <a href="#device_details_tab" role="tab" data-toggle="tab" aria-controls="device_details_tab">
-                            <i class="icon fw fw-mobile"></i><span class="hidden-sm">Device Details</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="list-group-item">
-                        <a href="#policy_compliance_tab" role="tab" data-toggle="tab" aria-controls="policy_compliance_tab">
-                            <i class="icon fw fw-policy"></i><span class="hidden-sm">Policy Compliance</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="list-group-item">
-                        <a href="#device_location_tab" role="tab" data-toggle="tab"
-                           data-lat="{{deviceView.location.latitude}}"
-                           data-long="{{deviceView.location.longitude}}"
-                           aria-controls="device_location_tab">
-                            <i class="icon fw fw-map-location"></i><span class="hidden-sm">Device Location</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="list-group-item">
-                        <a href="#installed_applications_tab" role="tab" data-toggle="tab" aria-controls="installed_applications_tab">
-                            <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="list-group-item">
-                        <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
-                            <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-            {{#defineZone "device-detail-properties"}}
-                <div class="media-body add-padding-left-5x remove-padding-xs">
-                <div class="panel-group tab-content remove-padding" id="tabs" role="tablist" aria-multiselectable="true">
-                <div class="arrow-left hidden-xs"></div>
-
-                <div class="panel panel-default" role="tabpanel" id="device_details_tab">
-                    <div class="panel-heading visible-xs collapsed" id="device_details">
-                        <h4 class="panel-title">
-                            <a role="button" data-toggle="collapse" data-parent="#tabs" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                <i class="fw fw-mobile fw-2x"></i>
-                                Device Details
-                                <i class="caret-updown fw fw-down"></i>
-                            </a>
-                        </h4>
-                    </div>
-                    <div class="panel-heading display-none-xs">Device Details</div>
-                    <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="device_details">
-                        <div class="panel-body ">
-                            <div class="device-detail-body">
-                                <!-- device summary -->
-                                {{#equal deviceView.deviceType "windows"}}
-                                    <div class="message message-info">
-                                        <h4 class="remove-margin"><i class="icon fw fw-info"></i>Not available yet</h4>
-                                    </div>
-                                {{/equal}}
-                                {{#if deviceView.deviceInfoAvailable}}
-                                    {{#if deviceView.BatteryLevel}}
-                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                            <div class="col-md-12">
-                                                <div class="wr-stats-board-tile">
-                                                    <div class="tile-name">BATTERY</div>
-                                                    <div>
-                                                        <div class="tile-icon"><i class="fw fw-battery"></i></div>
-                                                        <div class="tile-stats">
-                                                            {{deviceView.BatteryLevel.value}} %
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                    <!--{{#if deviceView.cpuUsage}}-->
-                                        <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
-                                            <!--<div class="col-md-12">-->
-                                                <!--<div class="wr-stats-board-tile">-->
-                                                    <!--<div class="tile-name">CPU Usage</div>-->
-                                                    <!--<div>-->
-                                                        <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
-                                                        <!--<div class="tile-stats">-->
-                                                            <!--{{deviceView.cpuUsage.value}} %-->
-                                                        <!--</div>-->
-                                                    <!--</div>-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</div>-->
-                                    <!--{{/if}}-->
-                                    {{#if deviceView.ramUsage}}
-                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                            <div class="col-md-12">
-                                                <div class="wr-stats-board-tile">
-                                                    <div class="tile-name">RAM Usage</div>
-                                                    <div>
-                                                        <div class="tile-icon"><i class="fw fw-hardware"></i></div>
-                                                        <div class="tile-stats">
-                                                            {{deviceView.ramUsage.value}} %
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                    {{#if deviceView.internalMemory}}
-                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                            <div class="col-md-12">
-                                                <div class="wr-stats-board-tile">
-                                                    <div class="tile-name">Local Storage</div>
-                                                    <div>
-                                                        <div class="tile-icon"><i class="fw fw-hdd"></i></div>
-                                                        <div class="tile-stats">
-                                                            {{deviceView.internalMemory.usage}} %
-                                                        <span class="tile-stats-free">
-                                                            TOTAL OF {{deviceView.internalMemory.total}} GB
-                                                        </span>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                    {{#if deviceView.externalMemory}}
-                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                            <div class="col-md-12">
-                                                <div class="wr-stats-board-tile">
-                                                    <div class="tile-name">External Storage</div>
-                                                    <div>
-                                                        <div class="tile-icon"><i class="fw fw-usb-drive"></i></div>
-                                                        <div class="tile-stats">
-                                                            {{deviceView.externalMemory.usage}} %
-                                                        <span class="tile-stats-free">
-                                                            TOTAL OF {{deviceView.externalMemory.total}} GB
-                                                        </span>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                {{else}}
-                                    <div class="message message-info">
-                                        <h4 class="remove-margin">
-                                            <i class="icon fw fw-info"></i>
-                                            Battery, RAM and Storage related information are not available yet.
-                                        </h4>
-                                    </div>
+                                {{#if deviceView.name}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
+                                        <td style="padding:10px 15px;">{{deviceView.name}}</td>
+                                    </tr>
                                 {{/if}}
-                            </div>
+                                {{#if deviceView.vendor}}
+                                    {{#if deviceView.model}}
+                                        <tr role="row" class="odd">
+                                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
+                                            <td style="padding:10px 15px;">{{deviceView.vendor}} {{deviceView.model}}</td>
+                                        </tr>
+                                    {{/if}}
+                                {{/if}}
+                                {{#if deviceView.status}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
+                                        <td style="padding:10px 15px;">
+                                            {{#equal deviceView.status "ACTIVE"}}<span><i
+                                                    class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
+                                            {{#equal deviceView.status "INACTIVE"}}<span><i
+                                                    class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
+                                            {{#equal deviceView.status "BLOCKED"}}<span><i
+                                                    class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
+                                            {{#equal deviceView.status "REMOVED"}}<span><i
+                                                    class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
+                                        </td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.owner}}
+                                    <tr role="row" class="odd">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
+                                        <td style="padding:10px 15px;">{{deviceView.owner}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.ownership}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
+                                        <td style="padding:10px 15px;">{{deviceView.ownership}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.imei}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
+                                        <td style="padding:10px 15px;">{{deviceView.imei}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.udid}}
+                                    <tr role="row" class="odd">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
+                                        <td style="padding:10px 15px;">{{deviceView.udid}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.osBuildDate}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Firmware Build
+                                            Date
+                                        </td>
+                                        <td style="padding:10px 15px;">{{deviceView.osBuildDate}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.phoneNumber}}
+                                    <tr role="row" class="odd">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
+                                        <td style="padding:10px 15px;">{{deviceView.phoneNumber}}</td>
+                                    </tr>
+                                {{/if}}
+                                {{#if deviceView.lastUpdatedTime}}
+                                    <tr role="row" class="even">
+                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
+                                        <td style="padding:10px 15px;">{{deviceView.lastUpdatedTime}}</td>
+                                    </tr>
+                                {{/if}}
+                                </tbody>
+                            </table>
+                        {{/defineZone}}
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                            Operations {{deviceView.isNotWindows}}
+                        </div>
+                        <div class="add-margin-top-4x">
+                            {{unit "mdm.unit.device.operation-bar" deviceType=deviceView.deviceType ownership=deviceView.ownership}}
                         </div>
                     </div>
                 </div>
-                <div class="panel panel-default visible-xs-block" role="tabpanel" id="policy_compliance_tab">
-                    <div class="panel-heading visible-xs collapsed" id="policy_compliance">
-                        <h4 class="panel-title">
-                            <a role="button"
-                               data-toggle="collapse" data-parent="#tabs" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-                                <i class="fw fw-policy fw-2x"></i>
-                                Policy Compliance
-                                <i class="caret-updown fw fw-down"></i>
-                            </a>
-                        </h4>
+                <div class="media tab-responsive">
+                    <div class="media-left col-xs-1 col-sm-1 col-md-2 col-lg-2 hidden-xs">
+                        <ul class="list-group nav nav-pills nav-stacked" role="tablist">
+                            {{#if deviceView.isNotWindows}}
+                                <li role="presentation" class="list-group-item active">
+                                    <a href="#device_details_tab" role="tab" data-toggle="tab"
+                                       aria-controls="device_details_tab">
+                                        <i class="icon fw fw-mobile"></i><span class="hidden-sm">Device Details</span>
+                                    </a>
+                                </li>
+                            {{/if}}
+                            {{#if deviceView.isNotWindows}}
+                            <li role="presentation" class="list-group-item">
+                            {{else}}
+                            <li role="presentation" class="list-group-item active">
+                            {{/if}}
+                            <li role="presentation" class="list-group-item">
+                                <a href="#policy_compliance_tab" role="tab" data-toggle="tab"
+                                   aria-controls="policy_compliance_tab">
+                                    <i class="icon fw fw-policy"></i><span class="hidden-sm">Policy Compliance</span>
+                                </a>
+                            </li>
+                            {{#if deviceView.isNotWindows}}
+                                <li role="presentation" class="list-group-item">
+                                    <a href="#device_location_tab" role="tab" data-toggle="tab"
+                                       data-lat="{{deviceView.location.latitude}}"
+                                       data-long="{{deviceView.location.longitude}}"
+                                       aria-controls="device_location_tab">
+                                        <i class="icon fw fw-map-location"></i><span
+                                            class="hidden-sm">Device Location</span>
+                                    </a>
+                                </li>
+                                <li role="presentation" class="list-group-item">
+                                    <a href="#installed_applications_tab" role="tab" data-toggle="tab"
+                                       aria-controls="installed_applications_tab">
+                                        <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
+                                    </a>
+                                </li>
+                            {{/if}}
+                            <li role="presentation" class="list-group-item">
+                                <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
+                                    <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
+                                </a>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="panel-heading display-none-xs">
-                        Policy Compliance
-                        &nbsp;&nbsp;
-                        <span>
+                    {{#defineZone "device-detail-properties"}}
+                        <div class="media-body add-padding-left-5x remove-padding-xs">
+                            <div class="panel-group tab-content remove-padding" id="tabs" role="tablist"
+                                 aria-multiselectable="true">
+                                <div class="arrow-left hidden-xs"></div>
+
+                                {{#if deviceView.isNotWindows}}
+                                    <div class="panel panel-default" role="tabpanel" id="device_details_tab">
+                                        <div class="panel-heading visible-xs collapsed" id="device_details">
+                                            <h4 class="panel-title">
+                                                <a role="button" data-toggle="collapse" data-parent="#tabs"
+                                                   href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                                                    <i class="fw fw-mobile fw-2x"></i>
+                                                    Device Details
+                                                    <i class="caret-updown fw fw-down"></i>
+                                                </a>
+                                            </h4>
+                                        </div>
+                                        <div class="panel-heading display-none-xs">Device Details</div>
+                                        <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel"
+                                             aria-labelledby="device_details">
+                                            <div class="panel-body ">
+                                                <div class="device-detail-body">
+                                                    <!-- device summary -->
+                                                    {{#equal deviceView.deviceType "windows"}}
+                                                        <div class="message message-info">
+                                                            <h4 class="remove-margin"><i class="icon fw fw-info"></i>Not
+                                                                available yet</h4>
+                                                        </div>
+                                                    {{/equal}}
+                                                    {{#if deviceView.deviceInfoAvailable}}
+                                                        {{#if deviceView.BatteryLevel}}
+                                                            <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                                                <div class="col-md-12">
+                                                                    <div class="wr-stats-board-tile">
+                                                                        <div class="tile-name">BATTERY</div>
+                                                                        <div>
+                                                                            <div class="tile-icon"><i
+                                                                                    class="fw fw-battery"></i></div>
+                                                                            <div class="tile-stats">
+                                                                                {{deviceView.BatteryLevel.value}} %
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        {{/if}}
+                                                            <!--{{#if deviceView.cpuUsage}}-->
+                                                        <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
+                                                        <!--<div class="col-md-12">-->
+                                                        <!--<div class="wr-stats-board-tile">-->
+                                                        <!--<div class="tile-name">CPU Usage</div>-->
+                                                        <!--<div>-->
+                                                        <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
+                                                        <!--<div class="tile-stats">-->
+                                                        <!--{{deviceView.cpuUsage.value}} %-->
+                                                        <!--</div>-->
+                                                        <!--</div>-->
+                                                        <!--</div>-->
+                                                        <!--</div>-->
+                                                        <!--</div>-->
+                                                            <!--{{/if}}-->
+                                                        {{#if deviceView.ramUsage}}
+                                                            <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                                                <div class="col-md-12">
+                                                                    <div class="wr-stats-board-tile">
+                                                                        <div class="tile-name">RAM Usage</div>
+                                                                        <div>
+                                                                            <div class="tile-icon"><i
+                                                                                    class="fw fw-hardware"></i></div>
+                                                                            <div class="tile-stats">
+                                                                                {{deviceView.ramUsage.value}} %
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        {{/if}}
+                                                        {{#if deviceView.internalMemory}}
+                                                            <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                                                <div class="col-md-12">
+                                                                    <div class="wr-stats-board-tile">
+                                                                        <div class="tile-name">Local Storage</div>
+                                                                        <div>
+                                                                            <div class="tile-icon"><i
+                                                                                    class="fw fw-hdd"></i>
+                                                                            </div>
+                                                                            <div class="tile-stats">
+                                                                                {{deviceView.internalMemory.usage}} %
+                                                                                <span class="tile-stats-free">
+                                                            TOTAL OF {{deviceView.internalMemory.total}} GB
+                                                        </span>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        {{/if}}
+                                                        {{#if deviceView.externalMemory}}
+                                                            <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                                                <div class="col-md-12">
+                                                                    <div class="wr-stats-board-tile">
+                                                                        <div class="tile-name">External Storage</div>
+                                                                        <div>
+                                                                            <div class="tile-icon"><i
+                                                                                    class="fw fw-usb-drive"></i></div>
+                                                                            <div class="tile-stats">
+                                                                                {{deviceView.externalMemory.usage}} %
+                                                                                <span class="tile-stats-free">
+                                                            TOTAL OF {{deviceView.externalMemory.total}} GB
+                                                        </span>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        {{/if}}
+                                                    {{else}}
+                                                        <div class="message message-info">
+                                                            <h4 class="remove-margin">
+                                                                <i class="icon fw fw-info"></i>
+                                                                Battery, RAM and Storage related information are not
+                                                                available yet.
+                                                            </h4>
+                                                        </div>
+                                                    {{/if}}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                {{/if}}
+
+                                <div class="panel panel-default visible-xs-block" role="tabpanel"
+                                     id="policy_compliance_tab">
+                                    <div class="panel-heading visible-xs collapsed" id="policy_compliance">
+                                        <h4 class="panel-title">
+                                            <a role="button"
+                                               data-toggle="collapse" data-parent="#tabs" href="#collapseTwo"
+                                               aria-expanded="true" aria-controls="collapseTwo">
+                                                <i class="fw fw-policy fw-2x"></i>
+                                                Policy Compliance
+                                                <i class="caret-updown fw fw-down"></i>
+                                            </a>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-heading display-none-xs">
+                                        Policy Compliance
+                                        &nbsp;&nbsp;
+                                        <span>
                             <a href="javascript:void(0);" id="refresh-policy">
                                 <i class="fw fw-refresh"></i>
                             </a>
                         </span>
-                    </div>
-                    <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="policy_compliance">
-                        <div class="panel-body ">
+                                    </div>
+                                    <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel"
+                                         aria-labelledby="policy_compliance">
+                                        <div class="panel-body ">
                             <span class="visible-xs add-padding-2x text-right">
                                 <a href="javascript:void(0);" id="refresh-policy">
                                     <i class="fw fw-refresh"></i>
                                 </a>
                             </span>
-                            <div id="policy-spinner"
-                                class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
-                                <i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;Loading Policy Compliance...
-                            </div>
-                            <div id="policy-list-container">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="panel panel-default visible-xs-block" role="tabpanel" id="device_location_tab">
-                    <div class="panel-heading visible-xs collapsed" id="device_location">
-                        <h4 class="panel-title">
-                            <a role="button" data-toggle="collapse" data-parent="#tabs" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
-                                <i class="fw fw-map-location fw-2x"></i>
-                                    Device Location
-                                <i class="caret-updown fw fw-down"></i>
-                            </a>
-                        </h4>
-                    </div>
-                    <div class="panel-heading display-none-xs">Device Location</div>
-                    <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="device_location">
-                        <div class="panel-body">
-                            {{#if deviceView.location}}
-                                <div id="device-location"
-                                     data-lat="{{deviceView.location.latitude}}"
-                                     data-long="{{deviceView.location.longitude}}">
+                                            <div id="policy-spinner"
+                                                 class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
+                                                <i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;Loading Policy
+                                                Compliance...
+                                            </div>
+                                            <div id="policy-list-container">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-                            {{else}}
-                                <div id="map-error" class="message message-warning">
-                                    <h4 class="remove-margin">
-                                        <i class="icon fw fw-warning"></i>
-                                        &nbsp;Device location information is not available.
-                                    </h4>
+                                <div class="panel panel-default visible-xs-block" role="tabpanel"
+                                     id="device_location_tab">
+                                    <div class="panel-heading visible-xs collapsed" id="device_location">
+                                        <h4 class="panel-title">
+                                            <a role="button" data-toggle="collapse" data-parent="#tabs"
+                                               href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
+                                                <i class="fw fw-map-location fw-2x"></i>
+                                                Device Location
+                                                <i class="caret-updown fw fw-down"></i>
+                                            </a>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-heading display-none-xs">Device Location</div>
+                                    <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
+                                         aria-labelledby="device_location">
+                                        <div class="panel-body">
+                                            {{#if deviceView.location}}
+                                                <div id="device-location"
+                                                     data-lat="{{deviceView.location.latitude}}"
+                                                     data-long="{{deviceView.location.longitude}}">
+                                                </div>
+                                            {{else}}
+                                                <div id="map-error" class="message message-warning">
+                                                    <h4 class="remove-margin">
+                                                        <i class="icon fw fw-warning"></i>
+                                                        &nbsp;Device location information is not available.
+                                                    </h4>
+                                                </div>
+                                                <p class="add-padding-5x"></p>
+                                                <p class="add-padding-5x"></p>
+                                                <p class="add-padding-5x"></p>
+                                            {{/if}}
+                                        </div>
+                                    </div>
                                 </div>
-                                <p class="add-padding-5x"></p>
-                                <p class="add-padding-5x"></p>
-                                <p class="add-padding-5x"></p>
-                            {{/if}}
-                        </div>
-                    </div>
-                </div>
-                <div class="panel panel-default visible-xs-block" role="tabpanel" id="installed_applications_tab">
-                    <div class="panel-heading visible-xs collapsed" id="installed_applications">
-                        <h4 class="panel-title">
-                            <a role="button" data-toggle="collapse" data-parent="#tabs" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
-                                <i class="fw fw-application fw-2x"></i>
-                                Installed Applications
-                                <i class="caret-updown fw fw-down"></i>
-                            </a>
-                        </h4>
-                    </div>
-                    <div class="panel-heading display-none-xs">
-                        Installed Applications
-                        &nbsp;&nbsp;
-                        <span>
+                                <div class="panel panel-default visible-xs-block" role="tabpanel"
+                                     id="installed_applications_tab">
+                                    <div class="panel-heading visible-xs collapsed" id="installed_applications">
+                                        <h4 class="panel-title">
+                                            <a role="button" data-toggle="collapse" data-parent="#tabs"
+                                               href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
+                                                <i class="fw fw-application fw-2x"></i>
+                                                Installed Applications
+                                                <i class="caret-updown fw fw-down"></i>
+                                            </a>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-heading display-none-xs">
+                                        Installed Applications
+                                        &nbsp;&nbsp;
+                                        <span>
                             <a href="javascript:void(0);" id="refresh-apps">
                                 <i class="fw fw-refresh"></i>
                             </a>
                         </span>
-                    </div>
-                    <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="installed_applications">
-                        <div class="panel-body">
+                                    </div>
+                                    <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel"
+                                         aria-labelledby="installed_applications">
+                                        <div class="panel-body">
                             <span class="visible-xs add-padding-2x text-right">
                                 <a href="javascript:void(0);" id="refresh-apps">
                                     <i class="fw fw-refresh"></i>
                                 </a>
                             </span>
-                            <div id="apps-spinner" class="wr-advance-operations-init hidden">
-                                <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications List...
-                            </div>
-                            <div id="applications-list-container">
-                                <div class="message message-info">
-                                    <h4>
-                                        <i class="icon fw fw-info"></i>
-                                        No applications found.
-                                    </h4>
-                                    <p>Please try refreshing in a while.</p>
+                                            <div id="apps-spinner" class="wr-advance-operations-init hidden">
+                                                <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications
+                                                List...
+                                            </div>
+                                            <div id="applications-list-container">
+                                                <div class="message message-info">
+                                                    <h4>
+                                                        <i class="icon fw fw-info"></i>
+                                                        No applications found.
+                                                    </h4>
+                                                    <p>Please try refreshing in a while.</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="panel panel-default visible-xs-block" role="tabpanel" id="event_log_tab">
-                    <div class="panel-heading visible-xs collapsed" id="event_log">
-                        <h4 class="panel-title">
-                            <a role="button" data-toggle="collapse" data-parent="#tabs" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
-                                <i class="fw fw-text fw-2x"></i>
-                                Operations Log
-                                <i class="caret-updown fw fw-down"></i>
-                            </a>
-                        </h4>
-                    </div>
-                    <div class="panel-heading display-none-xs">
-                        Operations Log
-                        &nbsp;&nbsp;
-                        <span>
+                                <div class="panel panel-default visible-xs-block" role="tabpanel" id="event_log_tab">
+                                    <div class="panel-heading visible-xs collapsed" id="event_log">
+                                        <h4 class="panel-title">
+                                            <a role="button" data-toggle="collapse" data-parent="#tabs"
+                                               href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
+                                                <i class="fw fw-text fw-2x"></i>
+                                                Operations Log
+                                                <i class="caret-updown fw fw-down"></i>
+                                            </a>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-heading display-none-xs">
+                                        Operations Log
+                                        &nbsp;&nbsp;
+                                        <span>
                             <a href="javascript:void(0);" id="refresh-operations">
                                 <i class="fw fw-refresh"></i>
                             </a>
                         </span>
-                    </div>
-                    <div id="collapseFive" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="event_log">
-                        <div class="panel-body">
+                                    </div>
+                                    <div id="collapseFive" class="panel-collapse collapse in" role="tabpanel"
+                                         aria-labelledby="event_log">
+                                        <div class="panel-body">
                                             <span class="visible-xs add-padding-2x text-right">
                                                 <a href="javascript:void(0);" id="refresh-operations">
                                                     <i class="fw fw-refresh"></i>
                                                 </a>
                                             </span>
-                            <div id="operations-spinner" class="wr-advance-operations-init hidden">
-                                <i class="fw fw-settings fw-spin fw-2x"></i> Loading Operations Log...
-                            </div>
-                            <div id="operations-log-container">
-                                <div class="message message-info">
-                                    <h4 class="remove-margin">
-                                        <i class="icon fw fw-info"></i>
-                                        There are no operations, performed yet on this device.
-                                    </h4>
+                                            <div id="operations-spinner" class="wr-advance-operations-init hidden">
+                                                <i class="fw fw-settings fw-spin fw-2x"></i> Loading Operations Log...
+                                            </div>
+                                            <div id="operations-log-container">
+                                                <div class="message message-info">
+                                                    <h4 class="remove-margin">
+                                                        <i class="icon fw fw-info"></i>
+                                                        There are no operations, performed yet on this device.
+                                                    </h4>
+                                                </div>
+                                            </div>
+                                            <table class="table table-striped table-hover table-bordered display data-table"
+                                                   id="operations-log-table">
+                                                <thead>
+                                                <tr class="sort-row">
+                                                    <th>Operation Code</th>
+                                                    <th>Status</th>
+                                                    <th>Request created at</th>
+                                                </tr>
+                                                </thead>
+                                                <tbody>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                            <table class="table table-striped table-hover table-bordered display data-table" id="operations-log-table">
-                                <thead>
-                                <tr class="sort-row">
-                                    <th>Operation Code</th>
-                                    <th>Status</th>
-                                    <th>Request created at</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                </tbody>
-                            </table>
                         </div>
-                    </div>
+                    {{/defineZone}}
                 </div>
-                </div>
-                </div>
-            {{/defineZone}}
-            </div>
             </div>
         {{else}}
             <h1 class="page-sub-title">
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
index 6ec083d68..93276b90a 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
@@ -21,6 +21,7 @@ function onRequest(context) {
     var deviceType = context["uriParams"]["deviceType"];
     var deviceId = request.getParameter("id");
     var deviceViewData = {};
+    var log = new Log("new log");
 
     if (deviceType && deviceId) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
@@ -35,6 +36,10 @@ function onRequest(context) {
             var viewModel = {};
             if (filteredDeviceData["type"]) {
                 viewModel["deviceType"] = filteredDeviceData["type"];
+                viewModel.isNotWindows = true;
+                if (viewModel["deviceType"] == "windows") {
+                    viewModel.isNotWindows = false;
+                }
             }
             if (filteredDeviceData["deviceIdentifier"]) {
                 viewModel["deviceIdentifier"] = filteredDeviceData["deviceIdentifier"];
@@ -139,7 +144,7 @@ function onRequest(context) {
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["updatedTime"]) {
                     viewModel["lastUpdatedTime"] = filteredDeviceData["latestDeviceInfo"]["updatedTime"].
-                        substr(0, filteredDeviceData["latestDeviceInfo"]["updatedTime"].indexOf("+"));
+                    substr(0, filteredDeviceData["latestDeviceInfo"]["updatedTime"].indexOf("+"));
                 }
                 viewModel["BatteryLevel"] = {};
                 viewModel["BatteryLevel"]["value"] = filteredDeviceData["latestDeviceInfo"]["batteryLevel"];
@@ -195,6 +200,6 @@ function onRequest(context) {
     } else {
         deviceViewData["deviceFound"] = false;
     }
-
+    log.error(stringify(deviceViewData));
     return deviceViewData;
 }
\ No newline at end of file