diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.hbs
index ab7bf0fce..1f166ffbf 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.hbs
@@ -26,6 +26,7 @@
         </a>
     </li>
     <li>
+        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/devices">
             Devices
         </a>
@@ -38,7 +39,15 @@
 {{/zone}}
 
 {{#zone "content"}}
-    {{unit "cdmf.unit.lib.data-table"}}
-    {{unit "cdmf.unit.device.operation-mod"}}
-    {{unit "cdmf.unit.device.view"}}
+    {{#if isAuthorized}}
+        {{unit "cdmf.unit.lib.data-table"}}
+        {{unit "cdmf.unit.device.operation-mod"}}
+        {{unit "cdmf.unit.device.view"}}
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You are not authorized to view any enrolled device in the system.
+    {{/if}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
index 21ce99302..1f7e9c088 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
@@ -17,17 +17,24 @@
  */
 
 function onRequest(context){
-    var utility = require("/app/modules/utility.js").utility;
-    context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
-        if (arguments.length < 3)
-            throw new Error("Handlebars Helper equal needs 2 parameters");
-        if( lvalue!=rvalue ) {
-            return options.inverse(this);
-        } else {
-            return options.fn(this);
-        }
-    });
+    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+    var viewModel = {};
 
-    var deviceType = context.uriParams.deviceType;
-    return {"deviceViewUnitName": utility.getTenantedDeviceUnitName(deviceType, "device-view")};
+    // permission checks
+    // [1] checking viewing devices permission
+    viewModel["isAuthorized"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+
+    if (viewModel["isAuthorized"]) {
+        context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
+            if (arguments.length < 3)
+                throw new Error("Handlebars Helper equal needs 2 parameters");
+            if( lvalue!=rvalue ) {
+                return options.inverse(this);
+            } else {
+                return options.fn(this);
+            }
+        });
+    }
+
+    return viewModel;
 }
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index 0c5652957..b56d066f1 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -156,6 +156,12 @@
                 </p>
             </div>
         </div>
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You are not authorized to view any enrolled device in the system.
     {{/if}}
 {{/zone}}
 
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/img/device_icons/android.png 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/img/device_icons/android.png
old mode 100755
new mode 100644
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 929a86660..4dfc3b86c 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
@@ -3,22 +3,25 @@
 {{unit "mdm.unit.device.qr-modal"}}
 
 {{#zone "contentTitle"}}
-    <div class="row wr-device-board">
-        <div class="col-lg-12 wr-secondary-bar">
-            <label class="device-id device-select" data-deviceid="{{device.deviceIdentifier}}"
-                   data-type="{{device.type}}">
-                Device {{device.name}}
-                {{#if device.viewModel.model}}
-                    <span class="lbl-device">
-                        ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
-                    </span>
-                {{/if}}
-            </label>
+    {{#if isAuthorized}}
+        <div class="row wr-device-board">
+            <div class="col-lg-12 wr-secondary-bar">
+                <label class="device-id device-select" data-deviceid="{{device.deviceIdentifier}}"
+                       data-type="{{device.type}}">
+                    Device {{device.name}}
+                    {{#if device.viewModel.model}}
+                        <span class="lbl-device">
+                            ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
+                        </span>
+                    {{/if}}
+                </label>
+            </div>
         </div>
-    </div>
+    {{/if}}
 {{/zone}}
 
 {{#zone "content"}}
+    {{#if isAuthorized}}
     <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">
@@ -82,63 +85,66 @@
             <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>
+                        <li class="list-group-item active">
+                            <a href="#device_details" role="tab" data-toggle="tab" aria-controls="device_details">
+                                <i class="icon fw fw-mobile"></i>Device Details
                             </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>
+                        <li class="list-group-item">
+                            <a href="#policy_compliance" role="tab" data-toggle="tab" aria-controls="policy_compliance">
+                                <i class="icon fw fw-policy"></i>Policy Compliance
                             </a>
                         </li>
-                        <li role="presentation" class="list-group-item">
-                            <a href="#device_location_tab" role="tab" data-toggle="tab"
+                        <li class="list-group-item">
+                            <a href="#device_location" role="tab" data-toggle="tab"
                                data-lat="{{device.viewModel.location.latitude}}"
                                data-long="{{device.viewModel.location.longitude}}"
-                               aria-controls="device_location_tab">
-                               <i class="icon fw fw-map-location"></i><span class="hidden-sm">Device Location</span>
+                               aria-controls="device_location">
+                               <i class="icon fw fw-map-location"></i> Device Location
                             </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>
+                        <li class="list-group-item">
+                            <a href="#installed_applications" role="tab" data-toggle="tab" aria-controls="installed_applications">
+                                <i class="icon fw fw-application"></i> Installed Applications
                             </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>
+                        <li class="list-group-item">
+                            <a href="#event_log" role="tab" data-toggle="tab" aria-controls="event_log">
+                                <i class="icon fw fw-text"></i> Operations Log
                             </a>
                         </li>
                     </ul>
                 </div>
+                <div class="media-body remove-padding-xs">
                 {{#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="panel-group tab-content" id="tabs">
                             <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">
+                            <div class="panel panel-default tab-pane fade in active fade-in-xs visible-block"
+                                 id="device_details" role="tabpanel"
+                                 aria-labelledby="device_details">
+                                <div class="panel-heading dropup visible-xs" role="tab" id="tab1" data-toggle="collapse"
+                                     data-target="#tabContent1" aria-expanded="false" data-parent="#tabs">
                                     <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>
+                                        <i class="fw fw-map-location fw-2x"></i>
+                                        Device Details
+                                        <i class="caret-updown fw fw-sort-up"></i>
                                     </h4>
                                 </div>
                                 <div class="panel-heading display-none-xs">Device Details</div>
                                 <div id="loading-content" class="col-centered">
-                                    <i class="fw fw-settings fw-spin fw-2x"></i> Loading Device Details...
+                                    <br><br>&nbsp;&nbsp;&nbsp;&nbsp;<i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;&nbsp;Loading Device Details . . .<br>
                                 </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 -->
+                                <div class="panel-body collapse display-block-sm display-block-md display-block-lg in"
+                                     id="tabContent1">
+                                    <div class="device-detail-body hidden">
+                                    <!-- device summary -->
                                             {{#equal device.type "windows"}}
-                                                <div class="message message-info">
-                                                    <h4 class="remove-margin"><i class="icon fw fw-info"></i>Not available yet</h4>
+                                                <div class="panel-body">
+                                                    Not available yet
                                                 </div>
+                                                <br class="c-both"/>
                                             {{/equal}}
                                             {{#if device.viewModel.BatteryLevel}}
                                                 <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
@@ -209,160 +215,170 @@
                                                     </div>
                                                 </div>
                                             {{/if}}
-                                        </div>
                                     </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>
+                            <div class="panel panel-default tab-pane fade fade-in-xs visible-block"
+                                 id="policy_compliance">
+                                <div class="panel-heading dropdown visible-xs collapsed" role="tab" id="tab2"
+                                     data-toggle="collapse" data-target="#tabContent2" aria-expanded="false"
+                                     data-parent="#tabs">
+                                    <h4 class="panel-title"><i class="fw fw-text fw-2x"></i>
+                                        Policy Compliance
+                                        <i class="caret-updown fw fw-sort-down"></i>
                                     </h4>
                                 </div>
                                 <div class="panel-heading display-none-xs">
                                     Policy Compliance
+                                    &nbsp;&nbsp;
                                     <span>
                                         <a href="#" 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 ">
-                                        <span class="visible-xs add-padding-2x text-right">
-                                            <a href="#" id="refresh-policy">
-                                                <i class="fw fw-refresh"></i>
-                                            </a>
-                                        </span>
-                                        <div id="policy-spinner" class="wr-advance-operations-init hidden">
-                                            <i class="fw fw-settings fw-spin fw-2x"></i> Loading Policy Compliance...
-                                        </div>
-                                        <div id="policy-list-container">
-                                            <div class="message message-info">
-                                                <h4 class="remove-margin"><i class="icon fw fw-info"></i>There is no active policy for this device.</h4>
-                                            </div>
+                                <div id="policy-spinner" class="wr-advance-operations-init hidden">
+                                    <br><br>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;
+                                    <i class="fw fw-settings fw-spin fw-2x"></i>
+                                    &nbsp;&nbsp;&nbsp;
+                                    Loading Policy Compliance . . .
+                                    <br>
+                                    <br>
+                                </div>
+                                <div class="panel-body collapse display-block-sm display-block-md display-block-lg" id="tabContent2">
+                                    <div id="policy-list-container">
+                                        <div class="panel-body">
+                                            There is no active policy for this device.
                                         </div>
+                                        <br class="c-both"/>
                                     </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">
+                            <div class="panel panel-default tab-pane fade fade-in-xs visible-block"
+                                 id="device_location">
+                                <div class="panel-heading dropdown visible-xs collapsed" role="tab" id="tab3"
+                                    data-toggle="collapse" data-target="#tabContent3" aria-expanded="false"
+                                    data-parent="#tabs">
                                     <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>
+                                        <i class="fw fw-text fw-2x"></i>
                                             Device Location
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
+                                        <i class="caret-updown fw fw-sort-down"></i>
                                     </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">
-                                        <div id="map-error" class="message message-danger">
-                                            <h4 class="remove-margin"><i class="icon fw fw-error"></i>Device location cannot be retrieved.</h4>
-                                        </div>
-                                        <div id="device-location"
-                                             data-lat="{{device.viewModel.location.latitude}}"
-                                             data-long="{{device.viewModel.location.longitude}}">
-                                        </div>
+                                <div class="panel-body collapse display-block-sm display-block-md display-block-lg"
+                                    id="tabContent3">
+                                    <div id="device-location"
+                                         data-lat="{{device.viewModel.location.latitude}}"
+                                         data-long="{{device.viewModel.location.longitude}}"
+                                         class="panel-body">
+                                    </div>
+                                    <div id="map-error" class="panel-body" style="margin: auto;">
+                                        Device location cannot be retrieved.
                                     </div>
+                                    <br class="c-both"/>
                                 </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">
+                            <div class="panel panel-default tab-pane fade fade-in-xs visible-block"
+                                 id="installed_applications">
+                                <div class="panel-heading dropdown visible-xs collapsed" role="tab" id="tab4"
+                                     data-toggle="collapse" data-target="#tabContent4" aria-expanded="false"
+                                     data-parent="#tabs">
                                     <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>
+                                        <i class="fw fw-text fw-2x"></i>
+                                        Installed Applications
+                                        <i class="caret-updown fw fw-sort-down"></i></h4>
                                 </div>
                                 <div class="panel-heading display-none-xs">
                                     Installed Applications
+                                    &nbsp;&nbsp;
                                     <span>
                                         <a href="#" 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 ">
-                                        <span class="visible-xs add-padding-2x text-right">
-                                            <a href="#" 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 the list in a while.</p>
-                                            </div>
+                                <div class="panel-body collapse display-block-sm display-block-md display-block-lg"
+                                     id="tabContent4">
+                                    <div id="apps-spinner" class="wr-advance-operations-init hidden">
+                                        <br><br>
+                                        &nbsp;&nbsp;&nbsp;&nbsp;<i class="fw fw-settings fw-spin fw-2x"></i>
+                                        &nbsp;&nbsp;&nbsp;Loading Applications List . . .<br><br>
+                                    </div>
+                                    <div id="applications-list-container">
+                                        <div class="panel-body">
+                                            <br>
+                                            <p class="fw-warning">
+                                                No applications found. please try refreshing the list in a while.
+                                            <p>
                                         </div>
+                                        <br class="c-both"/>
                                     </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">
+                            <div class="panel panel-default tab-pane fade fade-in-xs visible-block" id="event_log">
+                                <div class="panel-heading dropdown visible-xs collapsed" role="tab" id="tab5"
+                                     data-toggle="collapse" data-target="#tabContent5" aria-expanded="false"
+                                     data-parent="#tabs">
                                     <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 Logs
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
+                                        <i class="fw fw-text fw-2x"></i>
+                                            Operations Logs
+                                        <i class="caret-updown fw fw-sort-down"></i>
                                     </h4>
                                 </div>
                                 <div class="panel-heading display-none-xs">
                                     Operations Logs
+                                    &nbsp;&nbsp;
                                     <span>
                                         <a href="#" 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">
-                                        <span class="visible-xs add-padding-2x text-right">
-                                            <a href="#" 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>
+                                <div class="panel-body collapse display-block-sm display-block-md display-block-lg"
+                                    id="tabContent5">
+                                    <div id="operations-spinner" class="wr-advance-operations-init hidden">
+                                        <br><br>&nbsp;&nbsp;&nbsp;&nbsp;<i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;&nbsp;
+                                        Loading Operations Log . . .
+                                        <br><br>
+                                    </div>
+                                    <div id="operations-log-container">
+                                        <div class="panel-body">
+                                            There are no operations, performed yet on this device.
                                         </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>
+                                        <br class="c-both"/>
                                     </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>
+                </div>
                 {{/defineZone}}
             </div>
     </div>
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You are not authorized to view specified device in the system.
+    {{/if}}
 {{/zone}}
 {{#zone "bottomJs"}}
+    {{#if isAuthorized}}
     <script id="policy-view" src="{{@unit.publicUri}}/templates/policy-compliance.hbs"
             data-device-id="{{device.deviceIdentifier}}" data-device-type="{{device.type}}"
             type="text/x-handlebars-template"></script>
@@ -375,4 +391,5 @@
     {{js "js/device-detail.js"}}
     <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true"></script>
     {{js "js/load-map.js"}}
+    {{/if}}
 {{/zone}}
\ No newline at end of file
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 fe0d3a643..05309e1fa 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
@@ -17,7 +17,7 @@
  */
 
 function onRequest(context) {
-    var log = new Log("view.js");
+    // var log = new Log("view.js");
     var deviceType = context.uriParams.deviceType;
     var deviceId = request.getParameter("id");
     var deviceData = {};
@@ -26,6 +26,8 @@ function onRequest(context) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
         var response = deviceModule.viewDevice(deviceType, deviceId);
         if (response["status"] == "success") {
+            deviceData["isAuthorized"] = true;
+
             var device = response["content"];
             var viewModel = {};
             var deviceInfo = device["properties"]["DEVICE_INFO"];
@@ -54,8 +56,7 @@ function onRequest(context) {
                     viewModel["vendor"] = device["properties"]["VENDOR"];
                     var osBuildDate = device["properties"]["OS_BUILD_DATE"];
                     if (osBuildDate != null && osBuildDate != "0") {
-                        var formattedDate = new Date(osBuildDate * 1000);
-                        viewModel["os_build_date"] = formattedDate;
+                        viewModel["os_build_date"] = new Date(osBuildDate * 1000);
                     }
                     viewModel["internal_memory"] = {};
                     viewModel["external_memory"] = {};
@@ -96,6 +97,8 @@ function onRequest(context) {
                 device["viewModel"] = viewModel;
             }
             deviceData["device"] = device;
+        } else if (response["status"] == "unauthorized") {
+            deviceData["isAuthorized"] = false;
         }
         return deviceData;
     }