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 4dfc3b86c..8345741ac 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
@@ -2,373 +2,358 @@
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "mdm.unit.device.qr-modal"}}
 
-{{#zone "contentTitle"}}
-    {{#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>
-    {{/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">
-                <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>
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td>
-                            <td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.properties.model}}</td>
-                        </tr>
-                        {{#if device.viewModel.model}}
-                            <tr role="row" class="odd">
-                                <td class="sorting_1" style="padding:10px 15px;">Model</td>
-                                <td style="padding:10px 15px;">{{device.viewModel.model}}</td>
-                            </tr>
-                        {{/if}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px;">IMEI</td>
-                            <td style="padding:10px 15px;">{{device.viewModel.imei}}</td>
-                        </tr>
-                        {{#if device.viewModel.udid}}
+        <h1 class="page-sub-title 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}}
+        </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>
                             <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">UDID</td>
-                                <td style="padding:10px 15px;">{{device.viewModel.udid}}</td>
+                                <td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td>
+                                <td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.properties.model}}</td>
                             </tr>
-                        {{/if}}
-                        {{#if device.viewModel.os_build_date}}
+                            {{#if device.viewModel.model}}
+                                <tr role="row" class="odd">
+                                    <td class="sorting_1" style="padding:10px 15px;">Model</td>
+                                    <td style="padding:10px 15px;">{{device.viewModel.model}}</td>
+                                </tr>
+                            {{/if}}
                             <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Firmware Build Date</td>
-                                <td style="padding:10px 15px;">{{device.viewModel.os_build_date}}</td>
+                                <td class="sorting_1" style="padding:10px 15px;">IMEI</td>
+                                <td style="padding:10px 15px;">{{device.viewModel.imei}}</td>
                             </tr>
-                        {{/if}}
-                        {{#if device.viewModel.phoneNumber}}
+                            {{#if device.viewModel.udid}}
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">UDID</td>
+                                    <td style="padding:10px 15px;">{{device.viewModel.udid}}</td>
+                                </tr>
+                            {{/if}}
+                            {{#if device.viewModel.os_build_date}}
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Firmware Build Date</td>
+                                    <td style="padding:10px 15px;">{{device.viewModel.os_build_date}}</td>
+                                </tr>
+                            {{/if}}
+                            {{#if device.viewModel.phoneNumber}}
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Phone Number</td>
+                                    <td style="padding:10px 15px;">{{device.viewModel.phoneNumber}}</td>
+                                </tr>
+                            {{/if}}
                             <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Phone Number</td>
-                                <td style="padding:10px 15px;">{{device.viewModel.phoneNumber}}</td>
+                                <td class="sorting_1" style="padding:10px 15px;">Status</td>
+                                <td style="padding:10px 15px;">
+                                    {{#equal device.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
+                                    {{#equal device.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
+                                    {{#equal device.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
+                                    {{#equal device.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
+                                </td>
                             </tr>
-                        {{/if}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px;">Status</td>
-                            <td style="padding:10px 15px;">
-                                {{#equal device.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
-                                {{#equal device.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
-                                {{#equal device.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
-                                {{#equal device.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
-                            </td>
-                        </tr>
-                        </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=device.type}}
+                            </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=device.type}}
+                    </div>
                 </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 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 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 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">
-                               <i class="icon fw fw-map-location"></i> Device Location
-                            </a>
-                        </li>
-                        <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 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" id="tabs">
-                            <div class="arrow-left hidden-xs"></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="{{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>
+                                </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 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">
-                                        <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">
-                                    <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 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="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">
-                                                    <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">
-                                                                    {{device.viewModel.BatteryLevel}} %
+                                <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="loading-content" class="col-centered">
+                                        <i class="fw fw-settings fw-spin fw-2x"></i> Loading 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 device.type "windows"}}
+                                                    <div class="message message-info">
+                                                        <h4 class="remove-margin"><i class="icon fw fw-info"></i>Not available yet</h4>
+                                                    </div>
+                                                {{/equal}}
+                                                {{#if device.viewModel.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">
+                                                                        {{device.viewModel.BatteryLevel}} %
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                </div>
-                                            {{/if}}
-                                            {{#if device.viewModel.DeviceCapacity}}
-                                                <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">STORAGE</div>
-                                                            <div>
-                                                                <div class="tile-icon"><i class="fw fw-hdd"></i></div>
-                                                                <div class="tile-stats">
-                                                                    {{device.viewModel.DeviceCapacityPercentage}} %
-                                                                    <span class="tile-stats-free">
-                                                                        {{device.viewModel.AvailableDeviceCapacity}} GB Free
-                                                                    </span>
+                                                {{/if}}
+                                                {{#if device.viewModel.DeviceCapacity}}
+                                                    <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">STORAGE</div>
+                                                                <div>
+                                                                    <div class="tile-icon"><i class="fw fw-hdd"></i></div>
+                                                                    <div class="tile-stats">
+                                                                        {{device.viewModel.DeviceCapacityPercentage}} %
+                                                                        <span class="tile-stats-free">
+                                                                            {{device.viewModel.AvailableDeviceCapacity}} GB Free
+                                                                        </span>
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                </div>
-                                            {{/if}}
-                                            {{#if device.viewModel.internal_memory.FreeCapacity}}
-                                                <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">
-                                                                    {{device.viewModel.internal_memory.DeviceCapacityPercentage}} %
-                                                                    <span class="tile-stats-free">
-                                                                        {{device.viewModel.internal_memory.FreeCapacity}} GB Free
-                                                                    </span>
+                                                {{/if}}
+                                                {{#if device.viewModel.internal_memory.FreeCapacity}}
+                                                    <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">
+                                                                        {{device.viewModel.internal_memory.DeviceCapacityPercentage}} %
+                                                                        <span class="tile-stats-free">
+                                                                            {{device.viewModel.internal_memory.FreeCapacity}} GB Free
+                                                                        </span>
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                </div>
-                                            {{/if}}
-                                            {{#if device.viewModel.external_memory.FreeCapacity}}
-                                                <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">
-                                                                    {{device.viewModel.external_memory.DeviceCapacityPercentage}} %
-                                                                    <span class="tile-stats-free">
-                                                                        {{device.viewModel.external_memory.FreeCapacity}} GB Free
-                                                                    </span>
+                                                {{/if}}
+                                                {{#if device.viewModel.external_memory.FreeCapacity}}
+                                                    <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">
+                                                                        {{device.viewModel.external_memory.DeviceCapacityPercentage}} %
+                                                                        <span class="tile-stats-free">
+                                                                            {{device.viewModel.external_memory.FreeCapacity}} GB Free
+                                                                        </span>
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                </div>
-                                            {{/if}}
+                                                {{/if}}
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <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>
+                                <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
-                                        <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="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.
+                                        <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>
                                         </div>
-                                        <br class="c-both"/>
                                     </div>
                                 </div>
-                            </div>
-                            <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">
-                                        <i class="fw fw-text fw-2x"></i>
-                                            Device Location
-                                        <i class="caret-updown fw fw-sort-down"></i>
-                                    </h4>
-                                </div>
-                                <div class="panel-heading display-none-xs">Device Location</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 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 id="map-error" class="panel-body" style="margin: auto;">
-                                        Device location cannot be retrieved.
+                                    <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>
                                     </div>
-                                    <br class="c-both"/>
                                 </div>
-                            </div>
-                            <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">
-                                        <i class="fw fw-text fw-2x"></i>
+                                <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
-                                        <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 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>
+                                        <span>
+                                            <a href="#" id="refresh-apps">
+                                                <i class="fw fw-refresh"></i>
+                                            </a>
+                                        </span>
                                     </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 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>
                                         </div>
-                                        <br class="c-both"/>
                                     </div>
                                 </div>
-                            </div>
-                            <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">
-                                        <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 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 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 Logs
+                                                <i class="caret-updown fw fw-down"></i>
+                                            </a>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-heading display-none-xs">
+                                        Operations Logs
+                                        <span>
+                                            <a href="#" id="refresh-operations">
+                                                <i class="fw fw-refresh"></i>
+                                            </a>
+                                        </span>
                                     </div>
-                                    <div id="operations-log-container">
+                                    <div id="collapseFive" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="event_log">
                                         <div class="panel-body">
-                                            There are no operations, performed yet on this device.
+                                            <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>
+                                            <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>
-                                        <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>
+                    {{/defineZone}}
                 </div>
-                {{/defineZone}}
-            </div>
-    </div>
+        </div>
     {{else}}
         <h1 class="page-sub-title">
             Permission Denied
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.ui.navbar.nav-menu/public/js/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index 0fd23a58d..d80f6c6d5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -130,7 +130,7 @@ function loadNewNotifications() {
                                 viewModel["notifications"] = responsePayload["notifications"];
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="message message-info message-no-new"><h4><i class="icon fw fw-info"></i>No new notifications found...</h4></div>');
+                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
                             }
                         } else {
                             $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +