diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml
index eb937c2430..b54801592c 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml
@@ -20,5 +20,8 @@
 <artifacts>
     <artifact name="raspberrypi" version="1.0.0" type="carbon/application">
         <dependency artifact="raspberrypi_execution" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="raspberrypi_temperature_publisher" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="raspberrypi_temperature_store" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="raspberrypi_temperature_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql
index a6808ef149..e20970b98a 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql
@@ -6,10 +6,10 @@
 
 /* define streams/tables and write queries here ... */
 
-@Import('org.wso2.iot.raspberrypi:1.0.0')
+@Import('iot.per.device.stream.raspberrypi:1.0.0')
 define stream raspberrypi (meta_owner string, meta_deviceId string, meta_time long, temperature float);
 
-@Export('org.wso2.iot.devices.temperature:1.0.0')
+@Export('iot.per.device.stream.raspberrypi.temperature:1.0.0')
 define stream temperature (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, temperature float);
 
 from raspberrypi
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml
new file mode 100644
index 0000000000..7002e5f4d2
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="raspberrypi_temperature_publisher" version="1.0.0" type="event/publisher" serverRole="DataAnalyticsServer">
+    <file>temperature_publisher.xml</file>
+</artifact>
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml
new file mode 100644
index 0000000000..5f8afc4f12
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<eventPublisher name="publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
+    <from streamName="iot.per.device.stream.raspberrypi.temperature" version="1.0.0"/>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to eventAdapterType="secured-websocket"/>
+</eventPublisher>
+
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml
new file mode 100644
index 0000000000..b3d58b879d
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="raspberrypi_temperature_store" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>iot_per_device_stream_raspberrypi_temperature.xml</file>
+</artifact>
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml
new file mode 100644
index 0000000000..9d3d2621c4
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<EventStoreConfiguration>
+    <Source>
+        <StreamId>iot.per.device.stream.raspberrypi.temperature:1.0.0</StreamId>
+    </Source>
+    <RecordStoreName>EVENT_STORE</RecordStoreName>
+    <TableSchema>
+		<ColumnDefinition>
+			<Name>meta_owner</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceType</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceId</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_time</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>LONG</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>temperature</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>FLOAT</Type>
+		</ColumnDefinition>
+    </TableSchema>
+</EventStoreConfiguration>
\ No newline at end of file
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml
new file mode 100644
index 0000000000..4526dfd73b
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="raspberrypi_temperature_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>iot.per.device.stream.raspberrypi.temperature_1.0.0.json</file>
+</artifact>
+
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json
new file mode 100644
index 0000000000..212705222b
--- /dev/null
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json
@@ -0,0 +1,20 @@
+{
+  "name": "iot.per.device.stream.raspberrypi.temperature",
+  "version": "1.0.0",
+  "nickName": "Temperature Data",
+  "description": "Temperature data received from the Device",
+  "metaData": [
+    {"name":"owner","type":"STRING"},     
+    {"name":"deviceType","type":"STRING"},
+    {"name":"deviceId","type":"STRING"},  
+    {"name":"time","type":"LONG"}
+  ],
+  "payloadData": [
+    {
+      "name": "temperature","type": "FLOAT"
+    }
+  ]
+}
+	
+
+				                                    		
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java
index fdd36862ae..93999db63f 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java
@@ -112,8 +112,8 @@ public class RaspberryPiServiceImpl implements RaspberryPiService {
                                                    @QueryParam("from") long from, @QueryParam("to") long to) {
         String fromDate = String.valueOf(from);
         String toDate = String.valueOf(to);
-        String query = "deviceId:" + deviceId + " AND deviceType:" +
-                RaspberrypiConstants.DEVICE_TYPE + " AND time : [" + fromDate + " TO " + toDate + "]";
+        String query = "meta_deviceId:" + deviceId + " AND meta_deviceType:" +
+                RaspberrypiConstants.DEVICE_TYPE + " AND meta_time : [" + fromDate + " TO " + toDate + "]";
         String sensorTableName = RaspberrypiConstants.TEMPERATURE_EVENT_TABLE;
         try {
             if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized(new DeviceIdentifier(deviceId,
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java
index 5936cfb352..c19928ab74 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java
@@ -26,7 +26,7 @@ public class RaspberrypiConstants {
 
     public static final String BULB_CONTEXT = "BULB";
     //sensor events summerized table name
-    public static final String TEMPERATURE_EVENT_TABLE = "DEVICE_TEMPERATURE_SUMMARY";
+    public static final String TEMPERATURE_EVENT_TABLE = "IOT_PER_DEVICE_STREAM_RASPBERRYPI_TEMPERATURE";
 
     //mqtt tranport related constants
     public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic";
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
index 674dd8a590..29416c5afe 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
@@ -42,7 +42,7 @@ function onRequest(context) {
 			if (tokenPair) {
 				token = tokenPair.accessToken;
 			}
-			websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+			websocketEndpoint = websocketEndpoint + "/secured-websocket/iot.per.device.stream.raspberrypi.temperature/1.0.0?"
 				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
 		} else {
 			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + user.domain
@@ -50,7 +50,7 @@ function onRequest(context) {
 			if (tokenPair) {
 				token = tokenPair.accessToken;
 			}
-			websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/org.wso2.iot.devices.temperature/1.0.0?"
+			websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/iot.per.device.stream.raspberrypi.temperature/1.0.0?"
 				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
 		}
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
index c746157822..3bf9dcff90 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
@@ -24,16 +24,39 @@
 {{/zone}}
 
 {{#zone "device-thumbnail"}}
-    <img src="{{@unit.publicUri}}/images/firealarm-icon.png"/>
+    <img src="{{@unit.publicUri}}/images/firealarm-icon.png" class="img-responsive"/>
+{{/zone}}
+
+{{#zone "device-details-header"}}
+    <h1 class="device-id"
+    data-deviceid="{{device.deviceIdentifier}}"
+    data-type="{{device.type}}"
+    data-ownership="{{device.ownership}}"
+    data-owner="{{device.owner}}">
+    {{device.enrolmentInfo.owner}}'s {{device.name}}
+      <a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}">
+        <i class="fw fw-info"></i>
+      </a>
+    </h1>
+    <h4>Ownership - <strong>{{device.enrolmentInfo.ownership}}</strong></h4>
+    <h4>Device is
+      <strong>
+        {{#equal device.enrolmentInfo.status "ACTIVE"}}Active{{/equal}}
+        {{#equal device.enrolmentInfo.status "INACTIVE"}}Inactive{{/equal}}
+        {{#equal device.enrolmentInfo.status "BLOCKED"}}Blocked{{/equal}}
+        {{#equal device.enrolmentInfo.status "REMOVED"}}Removed{{/equal}}
+        {{#equal device.enrolmentInfo.status "UNREACHABLE"}}Unreachable{{/equal}}
+      </strong>
+    </h4>
 {{/zone}}
 
 {{#zone "device-opetations"}}
-    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-        Operations
-    </div>
-    <div class="add-margin-top-4x">
-        {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams
-        encodedFeaturePayloads=encodedFeaturePayloads}}
+    <div class="operation-container">
+      <div class="operation-title">
+          <h4>Device Operations</h4>
+      </div>
+      {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams
+      encodedFeaturePayloads=encodedFeaturePayloads}}
     </div>
 {{/zone}}
 
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.device-view/device-view.hbs 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.device-view/device-view.hbs
index 774fe4fc5c..09121c01f9 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.device-view/device-view.hbs
+++ 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.device-view/device-view.hbs
@@ -4,279 +4,103 @@
 {{#if deviceFound}}
     {{#if isAuthorized}}
 
-        {{#zone "device-details-header"}}
-            <h1 class="page-sub-title device-id device-select"
-                data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
-                data-ownership="{{device.ownership}}"
-                data-owner="{{device.owner}}" data-status="{{device.status}}">
-                Device {{device.name}}
-                {{#if device.model}}
-                    <span class="lbl-device">
-                    ( {{device.vendor}} {{device.model}} )
-                </span>
-                {{/if}}
-            </h1>
+        {{#zone "device-thumbnail"}}
+          <i class="fw fw-android device-type fw-2x"></i>
         {{/zone}}
 
-        {{#zone "overview-section"}}
-            <div class="media-body asset-desc add-padding-left-5x">
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
-                    Overview
-                </div>
-                <table class="table table-responsive table-striped" id="members">
-                    <tbody>
-                    {{#if device.deviceIdentifier}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
-                            <td style="padding:10px 15px;">{{device.deviceIdentifier}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.name}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
-                            <td style="padding:10px 15px;">{{device.name}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.vendor}}
-                        {{#if device.model}}
-                            <tr role="row" class="odd">
-                                <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
-                                <td style="padding:10px 15px;">{{device.vendor}}
-                                    {{device.model}}</td>
-                            </tr>
-                        {{/if}}
-                    {{/if}}
-                    {{#if device.status}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
-                            <td style="padding:10px 15px;">
-                                {{#equal device.status "ACTIVE"}}<span><i
-                                        class="fw fw-success icon-success"></i>Active</span>{{/equal}}
-                                {{#equal device.status "INACTIVE"}}<span><i
-                                        class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
-                                {{#equal device.status "BLOCKED"}}<span><i
-                                        class="fw fw-remove icon-danger"></i>Blocked</span>{{/equal}}
-                                {{#equal device.status "REMOVED"}}<span><i
-                                        class="fw fw-delete icon-danger"></i>Removed</span>{{/equal}}
-                                {{#equal device.status "UNREACHABLE"}}<span><i
-                                        class="fw fw-warning icon-warning"></i>Unreachable</span>{{/equal}}
-                            </td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.owner}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
-                            <td style="padding:10px 15px;">{{device.owner}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.ownership}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
-                            <td style="padding:10px 15px;">{{device.ownership}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.imei}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
-                            <td style="padding:10px 15px;">{{device.imei}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.udid}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
-                            <td style="padding:10px 15px;">{{device.udid}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.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;">{{device.osBuildDate}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.phoneNumber}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
-                            <td style="padding:10px 15px;">{{device.phoneNumber}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.lastUpdatedTime}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
-                            <td style="padding:10px 15px;">{{device.lastUpdatedTime}}</td>
-                        </tr>
-                    {{/if}}
-                    </tbody>
-                </table>
-            </div>
+        {{#zone "device-details-header"}}
+            <h1 class="device-id"
+            data-deviceid="{{device.deviceIdentifier}}"
+            data-type="{{device.type}}"
+            data-ownership="{{device.ownership}}"
+            data-owner="{{device.owner}}"
+            data-status="{{device.status}}">
+            {{device.owner}}'s {{device.name}}
+              <a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}
+              Firmware Build Date: {{device.osBuildDate}}
+              UDID: {{device.udid}}">
+                <i class="fw fw-info"></i>
+              </a>
+            </h1>
+            {{#if device.model}}
+              <h4>{{device.vendor}} {{device.model}}</h4>
+            {{/if}}
+            <h4>Ownership - <strong>{{device.ownership}}</strong></h4>
+            <h4>Device is
+              <strong>
+                {{#equal device.status "ACTIVE"}}Active{{/equal}}
+                {{#equal device.status "INACTIVE"}}Inactive{{/equal}}
+                {{#equal device.status "BLOCKED"}}Blocked{{/equal}}
+                {{#equal device.status "REMOVED"}}Removed{{/equal}}
+                {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}}
+              </strong>
+            </h4>
         {{/zone}}
 
-
         {{#zone "device-opetations"}}
             {{#if device.isNotRemoved}}
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                    Operations
-                </div>
-                <div class="add-margin-top-4x">
+                <div class="operation-container">
+                  <div class="operation-title">
+                      <h4>Device Operations</h4>
+                  </div>
                     {{unit "cdmf.unit.device.type.android.operation-bar" device=device
                            backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
                 </div>
             {{/if}}
         {{/zone}}
 
-        {{#zone "device-details-tab-injected"}}
-            <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 location_tab">
-                <a href="#device_location_tab" role="tab" data-toggle="tab"
-                   data-lat="{{device.location.latitude}}"
-                   data-long="{{device.location.longitude}}"
-                   aria-controls="device_location_tab"
-                   class="initGeoLocationLink">
-                    <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>
+        {{#zone "device-details"}}
+          {{#if device.deviceInfoAvailable}}
+            {{#if device.BatteryLevel}}
+              <p><i class="icon fw fw-battery fw-2x"></i> <span>{{device.BatteryLevel.value}}%</span></p>
+            {{/if}}
+            {{#if device.ramUsage}}
+              <p><i class="icon fw fw-hardware fw-2x fw-rotate-90"></i> <span>{{device.ramUsage.value}}%</span></p>
+            {{/if}}
+            {{#if device.internalMemory}}
+              <p><i class="icon fw fw-hdd fw-2x fw-rotate-90"></i> <span>{{device.internalMemory.usage}}</span>
+                <span class="memory-amt">GB/{{device.internalMemory.total}}GB</span></p>
+            {{/if}}
+            {{#if device.externalMemory}}
+              <p><i class="icon fw fw-usb-drive fw-2x"></i> <span>{{device.externalMemory.usage}}</span>
+                <span class="memory-amt">GB/{{device.externalMemory.total}}GB</span></p>
+            {{/if}}
+          {{else}}
+            <p>Battery, RAM and Storage related information are not
+            available yet.</p>
+          {{/if}}
         {{/zone}}
 
-        {{#zone "device-details-tab-contents"}}
-            <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 -->
-                            {{#if device.deviceInfoAvailable}}
-                                {{#if device.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.BatteryLevel
-                                                        .value}} %
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                {{/if}}
-                                    <!--{{#if device.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">-->
-                                <!--{{device.cpuUsage.value}} %-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                    <!--{{/if}}-->
-                                {{#if device.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">
-                                                        {{device.ramUsage
-                                                        .value}} %
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                {{/if}}
-                                {{#if device.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">
-                                                        {{device.internalMemory
-                                                        .usage}} %
-                                                        <span class="tile-stats-free">
-                                                            TOTAL OF {{device.internalMemory
-                                                        .total}} GB
-                                                        </span>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                {{/if}}
-                                {{#if device.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">
-                                                        {{device.externalMemory
-                                                        .usage}} %
-                                                        <span class="tile-stats-free">
-                                                            TOTAL OF {{device.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>
+        {{#zone "device-details-tab-injected"}}
+            <li><a data-toggle="tab" href="#location">Location</a></li>
+            <li><a data-toggle="tab" href="#app">Applications</a></li>
+            <li><a data-toggle="tab" href="#policy">Policy Compliance</a></li>
         {{/zone}}
 
         {{#zone "device-view-tab-injected-conents"}}
+            <div id="location" class="tab-pane fade">
+              {{#if device.location}}
+                  {{unit "cdmf.unit.geo-dashboard" device=device noGeoFencing=false hideSearch=true}}
+              {{else}}
+                  <div id="map-error" class="message message-warning">
+                      <h4 class="remove-margin">
+                          <i class="icon fw fw-warning"></i>
+                          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 id="app" class="tab-pane fade">
+              <div id="applications-list-container" data-public-uri="{{@unit.publicUri}}">
+              </div>
+            </div>
+            <div id="policy" class="tab-pane fade">
+              <div id="policy-list-container">
+              </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">
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.device-view/public/img/android_app_icon.png 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.device-view/public/img/android_app_icon.png
new file mode 100644
index 0000000000..9a84ea0706
Binary files /dev/null and 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.device-view/public/img/android_app_icon.png differ
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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
index be187afa2c..069969d267 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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
@@ -307,6 +307,8 @@ var InitiateViewOption = null;
                             viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
+                            var iconSource = $("#applications-list-container").data("public-uri") + "/img/android_app_icon.png";
+                            $("#applications-list-container img").attr("src",iconSource);
                         } 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>");
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.device-view/public/templates/applications-list.hbs 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.device-view/public/templates/applications-list.hbs
index ec6029dcc2..c25f353dff 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.device-view/public/templates/applications-list.hbs
+++ 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.device-view/public/templates/applications-list.hbs
@@ -1,31 +1,9 @@
-<div class="wr-app-listing">
-    <div class="wr-applist">
-        {{#each applications}}
-            <a style="text-align: center; width: 110px; height: 140px;">
-                {{#equal platform "android"}}<i class="icon fw fw-android"></i>{{/equal}}
-                {{#equal platform "ios"}}<i class="icon fw fw-apple"></i>{{/equal}}
-                {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
-                {{#equal isActive true}}
-                    <span style="word-wrap: break-word;">
-                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
-                            &nbsp;Active
-                        </span>
-                    <span style="word-wrap: break-word;"><b>{{name}}</b></span>
-                    <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
-                    {{#if memoryUsage}}
-                        <span style="word-wrap: break-word;">
-                                Memory Usage
-                            </span>
-                        <span style="word-wrap: break-word;">
-                                ( {{memoryUsage}} Bytes )
-                            </span>
-                    {{/if}}
-                {{/equal}}
-                {{#equal isActive false}}
-                    <span style="word-wrap: break-word;">{{name}}</span>
-                    <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
-                {{/equal}}
-            </a>
-        {{/each}}
-    </div>
-</div>
\ No newline at end of file
+{{#each applications}}
+  <div class="application">
+      <img src="">
+      <div class="app-info">
+          <h4>{{name}}</h4>
+          <p>v{{version}}</p>
+      </div>
+  </div>
+{{/each}}
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.device-view/public/templates/policy-compliance.hbs 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.device-view/public/templates/policy-compliance.hbs
index 8fba741a6a..61590d984b 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.device-view/public/templates/policy-compliance.hbs
+++ 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.device-view/public/templates/policy-compliance.hbs
@@ -1,63 +1,26 @@
-<div class="wr-list-group wr-sortable policy-list">
-<span class="list-group-item" id="{{id}}">
-    <div class="row">
-        <div class="col-lg-3 clearfix">
-            <span class="wr-list-icon">
-                {{#equal deviceType "android"}}
-                    <i class=" fw fw-android"></i>
-                {{/equal}}
-                {{#equal deviceType "ios"}}
-                    <i class=" fw fw-apple"></i>
-                {{/equal}}
-                {{#equal deviceType "windows"}}
-                    <i class=" fw fw-windows"></i>
-                {{/equal}}
-            </span>
-            <span class="wr-list-desc">
-                <h3 class="wr-list-name">{{policy.policyName}}</h3>
-                <span class="wr-list-username">{{deviceType}}</span>
-            </span>
-        </div>
-        <div class="col-lg-6">
-            <div class="row no-gutter">
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Ownership Type : </b> {{policy.ownershipType}}
-                    </div>
-                </div>
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Compliance Type :</b> {{policy.compliance}}
-                    </div>
-                </div>
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Compliance :</b>
-                        {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
-                        {{/equal}}
-                        {{#equal compliance "NON-COMPLIANT"}}
-                            <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
-                        {{/equal}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-3">
-            <span class="list-group-item-actions">
-                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}" class="cu-btn-inner
-                policy-view-link" data-id="{{id}}">
-                    <span class="fw-stack">
-                        <i class="fw fw-circle-outline fw-stack-2x"></i>
-                        <i class="fw fw-view fw-stack-1x"></i>
-                    </span>
-                    View
-                </a>
-            </span>
+<div class="policy-item">
+    {{#equal compliance "COMPLIANT"}}
+      <i class="icon fw fw-success fw-3x policy-status"></i>
+    {{/equal}}
+    {{#equal compliance "NON-COMPLIANT"}}
+      <i class="icon fw fw-warning fw-3x policy-status"></i>
+    {{/equal}}
+    <p>
+        <span class="policy-name">{{policy.policyName}}</span>
+        <span class="policy-platform">{{deviceType}}</span>
+    </p>
+    <p>
+        <span class="comp-type">Compliance Type : <strong>{{policy.compliance}}</strong></span>
+        <span class="ownership-type">Ownership type : <strong>{{policy.ownershipType}}</strong></span>
+    </p>
+    <div class="actions">
+        <div class="action-btn ripple">
+            <p><a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
+              <i class="icon fw fw-view fw-2x"></i> <span>View Policy </span></a></p>
         </div>
     </div>
-</span>
 </div>
+
 <table class="table table-striped table-hover table-bordered display data-table" id="policy-compliance-table">
     <thead>
         <tr class="sort-row">
@@ -77,4 +40,4 @@
     {{/each}}
     <br class="c-both" />
     </tbody>
-</table>
\ No newline at end of file
+</table>
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.operation-bar/operation-bar.hbs 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.operation-bar/operation-bar.hbs
index e0b5cb412c..6e2cf569a5 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.operation-bar/operation-bar.hbs
+++ 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.operation-bar/operation-bar.hbs
@@ -51,6 +51,7 @@
 
             <div class="operation" data-operation-code="{{operation}}">
                 <div class="content">
+
                     <div class="row">
                         <div class="col-lg-5 col-md-6 col-centered">
                             <h3>
@@ -65,6 +66,11 @@
                                 {{description}}
                                 <br>
                             </h4>
+
+                            <div id="operation-error-msg" class="alert alert-danger hidden" role="alert">
+                                <i class="icon fw fw-error"></i><span></span>
+                            </div>
+
                             <div id="operation-form">
                                 <form action="{{params.0.uri}}" method="{{params.0.method}}"
                                       style="padding-bottom: 20px;"
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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
index 8b621e931f..66fb22ec94 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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
@@ -27,6 +27,11 @@ function operationSelect(selection) {
     showPopup();
 }
 
+var resetLoader = function () {
+    $("#btnSend").removeClass("hidden");
+    $('#lbl-execution').addClass("hidden");
+};
+
 function submitForm(formId) {
     $("#btnSend").addClass("hidden");
     $("#lbl-execution").removeClass("hidden");
@@ -48,9 +53,9 @@ function submitForm(formId) {
         } else if (input.data("param-type") == "form") {
             var prefix = (uriencodedFormStr == "") ? "" : "&";
             uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
-            if(input.attr("type") == "text"){
+            if (input.attr("type") == "text") {
                 payload[input.attr("id")] = input.val();
-            } else if(input.attr("type") == "checkbox"){
+            } else if (input.attr("type") == "checkbox") {
                 payload[input.attr("id")] = input.is(":checked");
             }
         }
@@ -58,71 +63,74 @@ function submitForm(formId) {
     uri += uriencodedQueryStr;
     var httpMethod = form.attr("method").toUpperCase();
     //var contentType = form.attr("enctype");
+    var validaterString = validatePayload(operationCode, payload);
 
-    if (contentType == undefined || contentType == "") {
-        contentType = "application/x-www-form-urlencoded";
-        payload = uriencodedFormStr;
-    }
+    if (validaterString == "OK") {
 
-    //setting responses callbacks
-    var defaultStatusClasses = "fw fw-stack-1x";
-    var content = $("#operation-response-template").find(".content");
-    var title = content.find("#title");
-    var statusIcon = content.find("#status-icon");
-    var description = content.find("#description");
-    description.html("");
+        if (contentType == undefined || contentType == "") {
+            contentType = "application/x-www-form-urlencoded";
+            payload = uriencodedFormStr;
+        }
 
-    var resetLoader = function () {
-        $("#btnSend").removeClass("hidden");
-        $('#lbl-execution').addClass("hidden");
-    };
+        //setting responses callbacks
+        var defaultStatusClasses = "fw fw-stack-1x";
+        var content = $("#operation-response-template").find(".content");
+        var title = content.find("#title");
+        var statusIcon = content.find("#status-icon");
+        var description = content.find("#description");
+        description.html("");
 
-    var successCallBack = function (response) {
-        var res = response;
-        try {
-            res = JSON.parse(response).messageFromServer;
-        } catch (err) {
-            //do nothing
-        }
-        title.html("Operation Triggered!");
-        statusIcon.attr("class", defaultStatusClasses + " fw-check");
-        description.html(res);
-        // console.log("success!");
-        resetLoader();
-        $(modalPopupContent).html(content.html());
-    };
-    var errorCallBack = function (response) {
-        // console.log(response);
-        title.html("An Error Occurred!");
-        statusIcon.attr("class", defaultStatusClasses + " fw-error");
-        var reason = (response.responseText == "null")?response.statusText:response.responseText;
-        try {
-            reason = JSON.parse(reason).message;
-        } catch (err) {
-            //do nothing
+        var successCallBack = function (response) {
+            var res = response;
+            try {
+                res = JSON.parse(response).messageFromServer;
+            } catch (err) {
+                //do nothing
+            }
+            title.html("Operation Triggered!");
+            statusIcon.attr("class", defaultStatusClasses + " fw-check");
+            description.html(res);
+            // console.log("success!");
+            resetLoader();
+            $(modalPopupContent).html(content.html());
+        };
+        var errorCallBack = function (response) {
+            // console.log(response);
+            title.html("An Error Occurred!");
+            statusIcon.attr("class", defaultStatusClasses + " fw-error");
+            var reason = (response.responseText == "null") ? response.statusText : response.responseText;
+            try {
+                reason = JSON.parse(reason).message;
+            } catch (err) {
+                //do nothing
+            }
+            description.html(reason);
+            // console.log("Error!");
+            resetLoader();
+            $(modalPopupContent).html(content.html());
+        };
+        //executing http request
+        if (httpMethod == "GET") {
+            invokerUtil.get(uri, successCallBack, errorCallBack, contentType);
+        } else if (httpMethod == "POST") {
+            var deviceList = [deviceId];
+            payload = generatePayload(operationCode, payload, deviceList);
+            invokerUtil.post(uri, payload, successCallBack, errorCallBack, contentType);
+        } else if (httpMethod == "PUT") {
+            invokerUtil.put(uri, payload, successCallBack, errorCallBack, contentType);
+        } else if (httpMethod == "DELETE") {
+            invokerUtil.delete(uri, successCallBack, errorCallBack, contentType);
+        } else {
+            title.html("An Error Occurred!");
+            statusIcon.attr("class", defaultStatusClasses + " fw-error");
+            description.html("This operation requires http method: " + httpMethod + " which is not supported yet!");
+            resetLoader();
+            $(modalPopupContent).html(content.html());
         }
-        description.html(reason);
-        // console.log("Error!");
-        resetLoader();
-        $(modalPopupContent).html(content.html());
-    };
-    //executing http request
-    if (httpMethod == "GET") {
-        invokerUtil.get(uri, successCallBack, errorCallBack, contentType);
-    } else if (httpMethod == "POST") {
-        var deviceList = [deviceId];
-        payload = generatePayload(operationCode, payload, deviceList);
-        invokerUtil.post(uri, payload, successCallBack, errorCallBack, contentType);
-    } else if (httpMethod == "PUT") {
-        invokerUtil.put(uri, payload, successCallBack, errorCallBack, contentType);
-    } else if (httpMethod == "DELETE") {
-        invokerUtil.delete(uri, successCallBack, errorCallBack, contentType);
     } else {
-        title.html("An Error Occurred!");
-        statusIcon.attr("class", defaultStatusClasses + " fw-error");
-        description.html("This operation requires http method: " + httpMethod + " which is not supported yet!");
         resetLoader();
-        $(modalPopupContent).html(content.html());
+        $(".modal #operation-error-msg span").text(validaterString);
+        $(".modal #operation-error-msg").removeClass("hidden");
     }
 }
 
@@ -161,6 +169,21 @@ var operationTypeConstants = {
     "COMMAND": "command"
 };
 
+function validatePayload(operationCode, payload) {
+    console.log(payload);
+    var returnVal = "OK";
+    switch (operationCode) {
+        case "NOTIFICATION":
+            if (!payload.messageText) {
+                returnVal = "Message Body Can't be empty !";
+            }
+            break;
+        default:
+            break;
+
+    }
+    return returnVal;
+}
 
 var generatePayload = function (operationCode, operationData, deviceList) {
     var payload;
@@ -170,40 +193,40 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "CAMERA" : operationData["cameraEnabled"],
-                    "DISALLOW_ADJUST_VOLUME" : operationData["disallowAdjustVolumeEnabled"],
-                    "DISALLOW_CONFIG_BLUETOOTH" : operationData["disallowConfigBluetooth"],
-                    "DISALLOW_CONFIG_CELL_BROADCASTS" : operationData["disallowConfigCellBroadcasts"],
-                    "DISALLOW_CONFIG_CREDENTIALS" : operationData["disallowConfigCredentials"],
-                    "DISALLOW_CONFIG_MOBILE_NETWORKS" : operationData["disallowConfigMobileNetworks"],
-                    "DISALLOW_CONFIG_TETHERING" : operationData["disallowConfigTethering"],
-                    "DISALLOW_CONFIG_VPN" : operationData["disallowConfigVpn"],
-                    "DISALLOW_CONFIG_WIFI" : operationData["disallowConfigWifi"],
-                    "DISALLOW_APPS_CONTROL" : operationData["disallowAppControl"],
-                    "DISALLOW_CREATE_WINDOWS" : operationData["disallowCreateWindows"],
-                    "DISALLOW_CROSS_PROFILE_COPY_PASTE" : operationData["disallowCrossProfileCopyPaste"],
-                    "DISALLOW_DEBUGGING_FEATURES" : operationData["disallowDebugging"],
-                    "DISALLOW_FACTORY_RESET" : operationData["disallowFactoryReset"],
-                    "DISALLOW_ADD_USER" : operationData["disallowAddUser"],
-                    "DISALLOW_INSTALL_APPS" : operationData["disallowInstallApps"],
-                    "DISALLOW_INSTALL_UNKNOWN_SOURCES" : operationData["disallowInstallUnknownSources"],
-                    "DISALLOW_MODIFY_ACCOUNTS" : operationData["disallowModifyAccounts"],
-                    "DISALLOW_MOUNT_PHYSICAL_MEDIA" : operationData["disallowMountPhysicalMedia"],
-                    "DISALLOW_NETWORK_RESET" : operationData["disallowNetworkReset"],
-                    "DISALLOW_OUTGOING_BEAM" : operationData["disallowOutgoingBeam"],
-                    "DISALLOW_OUTGOING_CALLS" : operationData["disallowOutgoingCalls"],
-                    "DISALLOW_REMOVE_USER" : operationData["disallowRemoveUser"],
-                    "DISALLOW_SAFE_BOOT" : operationData["disallowSafeBoot"],
-                    "DISALLOW_SHARE_LOCATION" : operationData["disallowLocationSharing"],
-                    "DISALLOW_SMS" : operationData["disallowSMS"],
-                    "DISALLOW_UNINSTALL_APPS" : operationData["disallowUninstallApps"],
-                    "DISALLOW_UNMUTE_MICROPHONE" : operationData["disallowUnmuteMicrophone"],
-                    "DISALLOW_USB_FILE_TRANSFER" : operationData["disallowUSBFileTransfer"],
-                    "ALLOW_PARENT_PROFILE_APP_LINKING" : operationData["disallowParentProfileAppLinking"],
-                    "ENSURE_VERIFY_APPS" : operationData["ensureVerifyApps"],
-                    "AUTO_TIME" : operationData["enableAutoTime"],
-                    "SET_SCREEN_CAPTURE_DISABLED" : operationData["disableScreenCapture"],
-                    "SET_STATUS_BAR_DISABLED" : operationData["disableStatusBar"]
+                    "CAMERA": operationData["cameraEnabled"],
+                    "DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"],
+                    "DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"],
+                    "DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"],
+                    "DISALLOW_CONFIG_CREDENTIALS": operationData["disallowConfigCredentials"],
+                    "DISALLOW_CONFIG_MOBILE_NETWORKS": operationData["disallowConfigMobileNetworks"],
+                    "DISALLOW_CONFIG_TETHERING": operationData["disallowConfigTethering"],
+                    "DISALLOW_CONFIG_VPN": operationData["disallowConfigVpn"],
+                    "DISALLOW_CONFIG_WIFI": operationData["disallowConfigWifi"],
+                    "DISALLOW_APPS_CONTROL": operationData["disallowAppControl"],
+                    "DISALLOW_CREATE_WINDOWS": operationData["disallowCreateWindows"],
+                    "DISALLOW_CROSS_PROFILE_COPY_PASTE": operationData["disallowCrossProfileCopyPaste"],
+                    "DISALLOW_DEBUGGING_FEATURES": operationData["disallowDebugging"],
+                    "DISALLOW_FACTORY_RESET": operationData["disallowFactoryReset"],
+                    "DISALLOW_ADD_USER": operationData["disallowAddUser"],
+                    "DISALLOW_INSTALL_APPS": operationData["disallowInstallApps"],
+                    "DISALLOW_INSTALL_UNKNOWN_SOURCES": operationData["disallowInstallUnknownSources"],
+                    "DISALLOW_MODIFY_ACCOUNTS": operationData["disallowModifyAccounts"],
+                    "DISALLOW_MOUNT_PHYSICAL_MEDIA": operationData["disallowMountPhysicalMedia"],
+                    "DISALLOW_NETWORK_RESET": operationData["disallowNetworkReset"],
+                    "DISALLOW_OUTGOING_BEAM": operationData["disallowOutgoingBeam"],
+                    "DISALLOW_OUTGOING_CALLS": operationData["disallowOutgoingCalls"],
+                    "DISALLOW_REMOVE_USER": operationData["disallowRemoveUser"],
+                    "DISALLOW_SAFE_BOOT": operationData["disallowSafeBoot"],
+                    "DISALLOW_SHARE_LOCATION": operationData["disallowLocationSharing"],
+                    "DISALLOW_SMS": operationData["disallowSMS"],
+                    "DISALLOW_UNINSTALL_APPS": operationData["disallowUninstallApps"],
+                    "DISALLOW_UNMUTE_MICROPHONE": operationData["disallowUnmuteMicrophone"],
+                    "DISALLOW_USB_FILE_TRANSFER": operationData["disallowUSBFileTransfer"],
+                    "ALLOW_PARENT_PROFILE_APP_LINKING": operationData["disallowParentProfileAppLinking"],
+                    "ENSURE_VERIFY_APPS": operationData["ensureVerifyApps"],
+                    "AUTO_TIME": operationData["enableAutoTime"],
+                    "SET_SCREEN_CAPTURE_DISABLED": operationData["disableScreenCapture"],
+                    "SET_STATUS_BAR_DISABLED": operationData["disableStatusBar"]
                 }
             };
             break;
@@ -211,7 +234,7 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "lockCode" : operationData["lockCode"]
+                    "lockCode": operationData["lockCode"]
                 }
             };
             break;
@@ -219,7 +242,7 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "encrypted" : operationData["encryptStorageEnabled"]
+                    "encrypted": operationData["encryptStorageEnabled"]
                 }
             };
             break;
@@ -228,8 +251,8 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             payload = {
                 "operation": {
                     //"message" : operationData["message"]
-                    "messageText": operationData["messageText"],
-                    "messageTitle": operationData["messageTitle"]
+                    "messageTitle": operationData["messageTitle"],
+                    "messageText": operationData["messageText"]
                 }
             };
             break;
@@ -237,8 +260,8 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "schedule" : operationData["schedule"],
-                    "server" : operationData["server"]
+                    "schedule": operationData["schedule"],
+                    "server": operationData["server"]
                 }
             };
             break;
@@ -246,7 +269,7 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "pin" : operationData["pin"]
+                    "pin": operationData["pin"]
                 }
             };
             break;
@@ -255,15 +278,15 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             payload = {
                 "operation": {
                     "ssid": operationData["wifiSSID"],
-                    "type":  operationData["wifiType"],
-                    "password" : operationData["wifiPassword"],
-                    "eap" : operationData["wifiEAP"],
-                    "phase2" : operationData["wifiPhase2"],
-                    "provisioning" : operationData["wifiProvisioning"],
-                    "identity" : operationData["wifiIdentity"],
-                    "anonymousIdentity" : operationData["wifiAnoIdentity"],
-                    "cacert" : operationData["wifiCaCert"],
-                    "cacertName" : operationData["wifiCaCertName"]
+                    "type": operationData["wifiType"],
+                    "password": operationData["wifiPassword"],
+                    "eap": operationData["wifiEAP"],
+                    "phase2": operationData["wifiPhase2"],
+                    "provisioning": operationData["wifiProvisioning"],
+                    "identity": operationData["wifiIdentity"],
+                    "anonymousIdentity": operationData["wifiAnoIdentity"],
+                    "cacert": operationData["wifiCaCert"],
+                    "cacertName": operationData["wifiCaCertName"]
                 }
             };
             break;
@@ -282,8 +305,8 @@ var generatePayload = function (operationCode, operationData, deviceList) {
             operationType = operationTypeConstants["PROFILE"];
             payload = {
                 "operation": {
-                    "message" : operationData["lock-message"],
-                    "isHardLockEnabled" : operationData["hard-lock"]
+                    "message": operationData["lock-message"],
+                    "isHardLockEnabled": operationData["hard-lock"]
                 }
             };
             break;
@@ -375,39 +398,39 @@ var androidOperationConstants = {
     "LOCK_OPERATION_CODE": "DEVICE_LOCK",
     "UPGRADE_FIRMWARE": "UPGRADE_FIRMWARE",
     "DISALLOW_ADJUST_VOLUME": "DISALLOW_ADJUST_VOLUME",
-    "DISALLOW_CONFIG_BLUETOOTH" : "DISALLOW_CONFIG_BLUETOOTH",
-    "DISALLOW_CONFIG_CELL_BROADCASTS" : "DISALLOW_CONFIG_CELL_BROADCASTS",
-    "DISALLOW_CONFIG_CREDENTIALS" : "DISALLOW_CONFIG_CREDENTIALS",
-    "DISALLOW_CONFIG_MOBILE_NETWORKS" : "DISALLOW_CONFIG_MOBILE_NETWORKS",
-    "DISALLOW_CONFIG_TETHERING" : "DISALLOW_CONFIG_TETHERING",
-    "DISALLOW_CONFIG_VPN" : "DISALLOW_CONFIG_VPN",
-    "DISALLOW_CONFIG_WIFI" : "DISALLOW_CONFIG_WIFI",
-    "DISALLOW_APPS_CONTROL" : "DISALLOW_APPS_CONTROL",
-    "DISALLOW_CREATE_WINDOWS" : "DISALLOW_CREATE_WINDOWS",
-    "DISALLOW_CROSS_PROFILE_COPY_PASTE" : "DISALLOW_CROSS_PROFILE_COPY_PASTE",
-    "DISALLOW_DEBUGGING_FEATURES" : "DISALLOW_DEBUGGING_FEATURES",
-    "DISALLOW_FACTORY_RESET" : "DISALLOW_FACTORY_RESET",
-    "DISALLOW_ADD_USER" : "DISALLOW_ADD_USER",
-    "DISALLOW_INSTALL_APPS" : "DISALLOW_INSTALL_APPS",
-    "DISALLOW_INSTALL_UNKNOWN_SOURCES" : "DISALLOW_INSTALL_UNKNOWN_SOURCES",
-    "DISALLOW_MODIFY_ACCOUNTS" : "DISALLOW_MODIFY_ACCOUNTS",
-    "DISALLOW_MOUNT_PHYSICAL_MEDIA" : "DISALLOW_MOUNT_PHYSICAL_MEDIA",
-    "DISALLOW_NETWORK_RESET" : "DISALLOW_NETWORK_RESET",
-    "DISALLOW_OUTGOING_BEAM" : "DISALLOW_OUTGOING_BEAM",
-    "DISALLOW_OUTGOING_CALLS" : "DISALLOW_OUTGOING_CALLS",
-    "DISALLOW_REMOVE_USER" : "DISALLOW_REMOVE_USER",
-    "DISALLOW_SAFE_BOOT" : "DISALLOW_SAFE_BOOT",
-    "DISALLOW_SHARE_LOCATION" : "DISALLOW_SHARE_LOCATION",
-    "DISALLOW_SMS" : "DISALLOW_SMS",
-    "DISALLOW_UNINSTALL_APPS" : "DISALLOW_UNINSTALL_APPS",
-    "DISALLOW_UNMUTE_MICROPHONE" : "DISALLOW_UNMUTE_MICROPHONE",
-    "DISALLOW_USB_FILE_TRANSFER" : "DISALLOW_USB_FILE_TRANSFER",
-    "ALLOW_PARENT_PROFILE_APP_LINKING" : "ALLOW_PARENT_PROFILE_APP_LINKING",
-    "ENSURE_VERIFY_APPS" : "ENSURE_VERIFY_APPS",
-    "AUTO_TIME" : "AUTO_TIME",
-    "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
-    "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
-    "APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
+    "DISALLOW_CONFIG_BLUETOOTH": "DISALLOW_CONFIG_BLUETOOTH",
+    "DISALLOW_CONFIG_CELL_BROADCASTS": "DISALLOW_CONFIG_CELL_BROADCASTS",
+    "DISALLOW_CONFIG_CREDENTIALS": "DISALLOW_CONFIG_CREDENTIALS",
+    "DISALLOW_CONFIG_MOBILE_NETWORKS": "DISALLOW_CONFIG_MOBILE_NETWORKS",
+    "DISALLOW_CONFIG_TETHERING": "DISALLOW_CONFIG_TETHERING",
+    "DISALLOW_CONFIG_VPN": "DISALLOW_CONFIG_VPN",
+    "DISALLOW_CONFIG_WIFI": "DISALLOW_CONFIG_WIFI",
+    "DISALLOW_APPS_CONTROL": "DISALLOW_APPS_CONTROL",
+    "DISALLOW_CREATE_WINDOWS": "DISALLOW_CREATE_WINDOWS",
+    "DISALLOW_CROSS_PROFILE_COPY_PASTE": "DISALLOW_CROSS_PROFILE_COPY_PASTE",
+    "DISALLOW_DEBUGGING_FEATURES": "DISALLOW_DEBUGGING_FEATURES",
+    "DISALLOW_FACTORY_RESET": "DISALLOW_FACTORY_RESET",
+    "DISALLOW_ADD_USER": "DISALLOW_ADD_USER",
+    "DISALLOW_INSTALL_APPS": "DISALLOW_INSTALL_APPS",
+    "DISALLOW_INSTALL_UNKNOWN_SOURCES": "DISALLOW_INSTALL_UNKNOWN_SOURCES",
+    "DISALLOW_MODIFY_ACCOUNTS": "DISALLOW_MODIFY_ACCOUNTS",
+    "DISALLOW_MOUNT_PHYSICAL_MEDIA": "DISALLOW_MOUNT_PHYSICAL_MEDIA",
+    "DISALLOW_NETWORK_RESET": "DISALLOW_NETWORK_RESET",
+    "DISALLOW_OUTGOING_BEAM": "DISALLOW_OUTGOING_BEAM",
+    "DISALLOW_OUTGOING_CALLS": "DISALLOW_OUTGOING_CALLS",
+    "DISALLOW_REMOVE_USER": "DISALLOW_REMOVE_USER",
+    "DISALLOW_SAFE_BOOT": "DISALLOW_SAFE_BOOT",
+    "DISALLOW_SHARE_LOCATION": "DISALLOW_SHARE_LOCATION",
+    "DISALLOW_SMS": "DISALLOW_SMS",
+    "DISALLOW_UNINSTALL_APPS": "DISALLOW_UNINSTALL_APPS",
+    "DISALLOW_UNMUTE_MICROPHONE": "DISALLOW_UNMUTE_MICROPHONE",
+    "DISALLOW_USB_FILE_TRANSFER": "DISALLOW_USB_FILE_TRANSFER",
+    "ALLOW_PARENT_PROFILE_APP_LINKING": "ALLOW_PARENT_PROFILE_APP_LINKING",
+    "ENSURE_VERIFY_APPS": "ENSURE_VERIFY_APPS",
+    "AUTO_TIME": "AUTO_TIME",
+    "SET_SCREEN_CAPTURE_DISABLED": "SET_SCREEN_CAPTURE_DISABLED",
+    "SET_STATUS_BAR_DISABLED": "SET_STATUS_BAR_DISABLED",
+    "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
     "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
     "KIOSK_APPS_CODE": "KIOSK_APPS"
 };
\ No newline at end of file
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.type-view/private/config.json 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.type-view/private/config.json
index ee263e73e4..2008aad137 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.type-view/private/config.json
+++ 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.type-view/private/config.json
@@ -106,13 +106,13 @@
                 "formParams": [
                     {
                         "type": "text",
-                        "id": "messageText",
+                        "id": "messageTitle",
                         "optional": false,
                         "label": "Title Here..."
                     },
                     {
                         "type": "text",
-                        "id": "messageTitle",
+                        "id": "messageText",
                         "optional": false,
                         "label": "Message Here..."
                     }
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
index 937ab7c4ba..35eac61145 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
@@ -6,398 +6,87 @@
 {{#if deviceFound}}
     {{#if isAuthorized}}
 
-        {{#zone "device-details-header"}}
-            <h1 class="page-sub-title device-id device-select"
-                data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
-                data-ownership="{{device.ownership}}"
-                data-owner="{{device.owner}}" data-status="{{device.status}}">
-                Device {{device.name}}
-                {{#if device.model}}
-                    <span class="lbl-device">
-                    ( {{device.vendor}} {{device.model}} )
-                </span>
-                {{/if}}
-            </h1>
+        {{#zone "device-thumbnail"}}
+          <i class="fw fw-windows device-type fw-1x"></i>
         {{/zone}}
 
-        {{#zone "overview-section"}}
-            <div class="media-body asset-desc add-padding-left-5x">
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
-                    Overview
-                </div>
-                <table class="table table-responsive table-striped" id="members">
-                    <tbody>
-                    {{#if device.deviceIdentifier}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
-                            <td style="padding:10px 15px;">{{device.deviceIdentifier}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.name}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
-                            <td style="padding:10px 15px;">{{device.name}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.vendor}}
-                        {{#if device.model}}
-                            <tr role="row" class="odd">
-                                <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
-                                <td style="padding:10px 15px;">{{device.vendor}}
-                                    {{device.model}}</td>
-                            </tr>
-                        {{/if}}
-                    {{/if}}
-                    {{#if device.status}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
-                            <td style="padding:10px 15px;">
-                                {{#if permissions.CHANGE_DEVICE_STATUS}}
-                                    {{#equal device.status "ACTIVE"}}<span><i id="statusIcon"
-                                                                              class="fw fw-success icon-success"></i>
-                                    <a href="#" id="status" data-type="select" data-pk="1"
-                                       data-title="Select status"
-                                       selectedValue="Active"></a>
-                                    </span>{{/equal}}
-                                    {{#equal device.status "INACTIVE"}}<span><i id="statusIcon"
-                                                                                class="fw fw-warning icon-warning"></i>
-                                    <a href="#" id="status" data-type="select" data-pk="1"
-                                       data-title="Select status"
-                                       selectedValue="Inactive"></a>
-                                    </span>{{/equal}}
-                                    {{#equal device.status "BLOCKED"}}<span><i id="statusIcon"
-                                                                               class="fw fw-remove icon-danger"></i>
-                                    <a href="#" id="status" data-type="select" data-pk="1"
-                                       data-title="Select status"
-                                       selectedValue="Blocked"></a>
-                                    </span>{{/equal}}
-                                    {{#equal device.status "REMOVED"}}<span><i id="statusIcon"
-                                                                               class="fw fw-delete icon-danger"></i>
-                                    <a href="#" id="status" data-type="select" data-pk="1"
-                                       data-title="Select status"
-                                       selectedValue="Removed"></a>
-                                    </span>{{/equal}}
-                                {{else}}
-                                    {{#equal device.status "ACTIVE"}}<span><i
-                                            class="fw fw-success icon-success"></i> Active</span>{{/equal}}
-                                    {{#equal device.status "INACTIVE"}}<span><i
-                                            class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}}
-                                    {{#equal device.status "BLOCKED"}}<span><i
-                                            class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
-                                    {{#equal device.status "REMOVED"}}<span><i
-                                            class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
-                                {{/if}}
-                            </td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.owner}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
-                            <td style="padding:10px 15px;">{{device.owner}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.ownership}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
-                            <td style="padding:10px 15px;">{{device.ownership}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.imei}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
-                            <td style="padding:10px 15px;">{{device.imei}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.udid}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
-                            <td style="padding:10px 15px;">{{device.udid}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.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;">{{device.osBuildDate}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.phoneNumber}}
-                        <tr role="row" class="odd">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
-                            <td style="padding:10px 15px;">{{device.phoneNumber}}</td>
-                        </tr>
-                    {{/if}}
-                    {{#if device.lastUpdatedTime}}
-                        <tr role="row" class="even">
-                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
-                            <td style="padding:10px 15px;">{{device.lastUpdatedTime}}</td>
-                        </tr>
-                    {{/if}}
-                    </tbody>
-                </table>
-            </div>
+        {{#zone "device-details-header"}}
+            <h1 class="device-id"
+            data-deviceid="{{device.deviceIdentifier}}"
+            data-type="{{device.type}}"
+            data-ownership="{{device.ownership}}"
+            data-owner="{{device.owner}}"
+            data-status="{{device.status}}">
+            {{device.owner}}'s {{device.name}}
+              <a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}
+              Firmware Build Date: {{device.osBuildDate}}
+              UDID: {{device.udid}}">
+                <i class="fw fw-info"></i>
+              </a>
+            </h1>
+            {{#if device.model}}
+              <h4>{{device.vendor}} {{device.model}}</h4>
+            {{/if}}
+            <h4>Ownership - <strong>{{device.ownership}}</strong></h4>
+            <h4>Device is
+              <strong>
+                {{#equal device.status "ACTIVE"}}Active{{/equal}}
+                {{#equal device.status "INACTIVE"}}Inactive{{/equal}}
+                {{#equal device.status "BLOCKED"}}Blocked{{/equal}}
+                {{#equal device.status "REMOVED"}}Removed{{/equal}}
+                {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}}
+              </strong>
+            </h4>
         {{/zone}}
 
-
         {{#zone "device-opetations"}}
             {{#if device.isNotRemoved}}
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                    Operations
-                </div>
-                <div class="add-margin-top-4x">
-                    {{unit "cdmf.unit.device.type.windows.new.operation-bar" device=device
-                    backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
+                <div class="operation-container">
+                  <div class="operation-title">
+                      <h4>Device Operations</h4>
+                  </div>
+                  {{unit "cdmf.unit.device.type.windows.new.operation-bar" device=device
+                  backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
                 </div>
             {{/if}}
         {{/zone}}
 
-        {{#zone "device-details-tab-injected"}}
-            <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.location.latitude}}"
-                   data-long="{{device.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-->
+        {{#zone "device-details"}}
+          {{#if device.deviceInfoAvailable}}
+            {{#if device.BatteryLevel}}
+              <p><i class="icon fw fw-battery fw-2x"></i> <span>{{device.BatteryLevel.value}}%</span></p>
+            {{/if}}
+            {{#if device.ramUsage}}
+              <p><i class="icon fw fw-hardware fw-2x fw-rotate-90"></i> <span>{{device.ramUsage.value}} MB</span></p>
+            {{/if}}
+            {{#if device.internalMemory}}
+              <p><i class="icon fw fw-hdd fw-2x fw-rotate-90"></i> <span>{{device.internalMemory.value}} GB</span>
+              </p>
+            {{/if}}
+          {{else}}
+            <p>Battery, RAM and Storage related information are not
+            available yet.</p>
+          {{/if}}
         {{/zone}}
 
-        {{#zone "device-details-tab-contents"}}
-            <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 -->
-                            {{#if device.deviceInfoAvailable}}
-                                <!--{{#if device.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">Remaining BATTERY</div>-->
-                                                <!--<div>-->
-                                                    <!--<div class="tile-icon"><i-->
-                                                            <!--class="fw fw-battery"></i></div>-->
-                                                    <!--<div class="tile-stats">-->
-                                                        <!--{{device.BatteryLevel.value}}-->
-                                                    <!--</div>-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                <!--{{/if}}-->
-                                    <!--{{#if device.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">-->
-                                <!--{{device.cpuUsage.value}} %-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                <!--</div>-->
-                                    <!--{{/if}}-->
-                                {{#if device.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">Available RAM</div>
-                                                <div>
-                                                    <div class="tile-icon"><i
-                                                            class="fw fw-hardware"></i></div>
-                                                    <div class="tile-stats">
-                                                        {{device.ramUsage
-                                                        .value}} MB
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                {{/if}}
-                                {{#if device.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">Available Local Storage</div>
-                                                <div>
-                                                    <div class="tile-icon"><i
-                                                            class="fw fw-hdd"></i>
-                                                    </div>
-                                                    <div class="tile-stats">
-                                                        {{device.internalMemory
-                                                        .value}} GB
-                                                    </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>
+        {{#zone "device-details-tab-injected"}}
+            <li><a data-toggle="tab" href="#location">Location</a></li>
+            <li><a data-toggle="tab" href="#app">Applications</a></li>
+            <li><a data-toggle="tab" href="#policy">Policy Compliance</a></li>
         {{/zone}}
 
         {{#zone "device-view-tab-injected-conents"}}
-            <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
-
-                                        <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 ">
-                            <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>Loading Policy
-                            Compliance...
-                        </div>
-                        <div id="policy-list-container">
-                        </div>
-                    </div>
-                </div>
+            <div id="location" class="tab-pane fade ">
+                <iframe width="100%" height="100%" frameborder="0" style="border:0"
+                    src="https://www.google.com/maps/embed/v1/place?q=place_id:ChIJk_gsqyVZ4joR4UxR7brwMnA&key=AIzaSyChgf100i4rBz6neCNRyK1D05g9VLY8jvo" allowfullscreen></iframe>
             </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 device.location}}
-                            <div id="device-location"
-                                 data-lat="{{device.location.latitude}}"
-                                 data-long="{{device.location.longitude}}">
-                            </div>
-                        {{else}}
-                            <div id="map-error" class="message message-warning">
-                                <h4 class="remove-margin">
-                                    <i class="icon fw fw-warning"></i>
-                                    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 id="app" class="tab-pane fade">
+              <div id="applications-list-container" data-public-uri="{{@unit.publicUri}}">
+              </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
-
-                                        <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">
-                            <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>
-                        </div>
-                    </div>
-                </div>
+            <div id="policy" class="tab-pane fade">
+              <div id="policy-list-container">
+              </div>
             </div>
 
         {{/zone}}
@@ -434,4 +123,4 @@
         <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
+{{/zone}}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/img/device_icons/windows_app_icon.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/img/device_icons/windows_app_icon.png
new file mode 100644
index 0000000000..b373460318
Binary files /dev/null and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/img/device_icons/windows_app_icon.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
index 13684afe44..0928e4d4ba 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
@@ -291,6 +291,8 @@ var InitiateViewOption = null;
                             viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
+                            var iconSource = $("#applications-list-container").data("public-uri") + "/img/device_icons/windows_app_icon.png";
+                            $("#applications-list-container img").attr("src",iconSource);
                         } else {
                             $("#applications-list-container").
                                 html("<div class='message message-info'><h4><i class='icon fw fw-info'></i>No applications found.</h4>" +
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
old mode 100755
new mode 100644
index ec6029dcc2..c25f353dff
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
@@ -1,31 +1,9 @@
-<div class="wr-app-listing">
-    <div class="wr-applist">
-        {{#each applications}}
-            <a style="text-align: center; width: 110px; height: 140px;">
-                {{#equal platform "android"}}<i class="icon fw fw-android"></i>{{/equal}}
-                {{#equal platform "ios"}}<i class="icon fw fw-apple"></i>{{/equal}}
-                {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
-                {{#equal isActive true}}
-                    <span style="word-wrap: break-word;">
-                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
-                            &nbsp;Active
-                        </span>
-                    <span style="word-wrap: break-word;"><b>{{name}}</b></span>
-                    <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
-                    {{#if memoryUsage}}
-                        <span style="word-wrap: break-word;">
-                                Memory Usage
-                            </span>
-                        <span style="word-wrap: break-word;">
-                                ( {{memoryUsage}} Bytes )
-                            </span>
-                    {{/if}}
-                {{/equal}}
-                {{#equal isActive false}}
-                    <span style="word-wrap: break-word;">{{name}}</span>
-                    <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
-                {{/equal}}
-            </a>
-        {{/each}}
-    </div>
-</div>
\ No newline at end of file
+{{#each applications}}
+  <div class="application">
+      <img src="">
+      <div class="app-info">
+          <h4>{{name}}</h4>
+          <p>v{{version}}</p>
+      </div>
+  </div>
+{{/each}}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
old mode 100755
new mode 100644
index 1eb233dfee..d87b813f1a
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
@@ -1,61 +1,27 @@
-<div class="wr-list-group wr-sortable policy-list">
-<span class="list-group-item" id="{{id}}">
-    <div class="row">
-        <div class="col-lg-3 clearfix">
-            <span class="wr-list-icon">
-                {{#equal deviceType "android"}}
-                    <i class=" fw fw-android"></i>
-                {{/equal}}
-                {{#equal deviceType "ios"}}
-                    <i class=" fw fw-apple"></i>
-                {{/equal}}
-                {{#equal deviceType "windows"}}
-                    <i class=" fw fw-windows"></i>
-                {{/equal}}
-            </span>
-            <span class="wr-list-desc">
-                <h3 class="wr-list-name">{{policy.policyName}}</h3>
-                <span class="wr-list-username">{{deviceType}}</span>
-            </span>
+<div class="policy-item">
+    {{#equal compliance "COMPLIANT"}}
+      <i class="icon fw fw-success fw-3x policy-status"></i>
+    {{/equal}}
+    {{#equal compliance "NON-COMPLIANT"}}
+      <i class="icon fw fw-warning fw-3x policy-status"></i>
+    {{/equal}}
+    <p>
+        <span class="policy-name">{{policy.policyName}}</span>
+        <span class="policy-platform">{{deviceType}}</span>
+    </p>
+    <p>
+        <span class="comp-type">Compliance Type : <strong>{{policy.compliance}}</strong></span>
+        <span class="ownership-type">Ownership type : <strong>{{policy.ownershipType}}</strong></span>
+    </p>
+    <div class="actions">
+        <div class="action-btn ripple">
+            <p><a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
+              <i class="icon fw fw-view fw-2x"></i> <span>View Policy </span></a></p>
         </div>
-        <div class="col-lg-6">
-            <div class="row no-gutter">
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Ownership Type : </b> {{policy.ownershipType}}
-                    </div>
-                </div>
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Compliance Type :</b> {{policy.compliance}}
-                    </div>
-                </div>
-                <div class="wr-desc-list-configs col-lg-4">
-                    <div>
-                        <b>Compliance :</b>
-                        {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
-                        {{/equal}}
-                        {{#equal compliance "NON-COMPLIANT"}}
-                            <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
-                        {{/equal}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-3">
-            <span class="list-group-item-actions">
-                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}"  class="cu-btn-inner policy-view-link" data-id="{{id}}">
-                    <span class="fw-stack">
-                        <i class="fw fw-circle-outline fw-stack-2x"></i>
-                        <i class="fw fw-view fw-stack-1x"></i>
-                    </span>
-                    View
-                </a>
-            </span>
+        <div class="action-btn ripple">
+            <p><i class="icon fw fw-refresh fw-2x fw-flip-horizontal"></i> <span>Revoke Policy </span></p>
         </div>
     </div>
-</span>
 </div>
 <table class="table table-striped table-hover table-bordered display data-table" id="policy-compliance-table">
     <thead>
@@ -76,4 +42,4 @@
     {{/each}}
     <br class="c-both" />
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml
index 11cc1d962c..498f70f4bd 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml
@@ -21,5 +21,5 @@
         <property name="topic">carbon.super/raspberrypi/+/temperature</property>
     </from>
     <mapping customMapping="disable" type="json"/>
-    <to streamName="org.wso2.iot.raspberrypi" version="1.0.0"/>
+    <to streamName="iot.per.device.stream.raspberrypi" version="1.0.0"/>
 </eventReceiver>
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json
similarity index 87%
rename from features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json
rename to features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json
index 225db3d1c6..c2210f50b0 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json
@@ -1,5 +1,5 @@
 {
-  "name": "org.wso2.iot.raspberrypi",
+  "name": "iot.per.device.stream.raspberrypi",
   "version": "1.0.0",
   "nickName": "raspberrypi",
   "description": "Temperature data received from the raspberrypi",
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py
index ccfa6b0677..f05d8e0184 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py
@@ -101,7 +101,7 @@ def main():
     print ("MQTT_LISTENER: MQTT_TOPIC is " + TOPIC_TO_SUBSCRIBE)
 
     global mqttClient
-    mqttClient = mqtt.Client()
+    mqttClient = mqtt.Client(client_id="RaspberryPi Agent")
     mqttClient.on_connect = on_connect
     mqttClient.on_message = on_message
     mqttClient.on_publish = on_publish
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh
index f85bc7a98f..c4a0dced19 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh
@@ -39,11 +39,16 @@ sudo apt-get update
 sudo apt-get install python-pip
 sudo pip install paho-mqtt
 
-#installing ada
+# installing ada
+echo ===Installing ADA libraries
 sudo apt-get install build-essential python-dev
 unzip Adafruit_Python_DHT
-sudo python Adafruit_Python_DHT/setup.py install
+cd Adafruit_Python_DHT
+sudo python setup.py install
+cd ..
 
+# moving files to start the agent as Daemon
+echo ===Moving files to start agent as Daemon
 sudo cp $currentDir/deviceConfig.properties $currentDir/src
 sudo cp -r $currentDir/src $destination
 sudo chmod 755 $destination/src/RaspberryAgent.py
@@ -51,4 +56,4 @@ sudo update-rc.d -f RaspberryService.sh remove
 sudo cp $currentDir/RaspberryService.sh /etc/init.d
 sudo chmod 755 /etc/init.d/RaspberryService.sh
 sudo update-rc.d RaspberryService.sh defaults
-sudo service RaspberryService.sh start
+sudo service RaspberryService.sh start
\ No newline at end of file