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.device-view/device-view.hbs 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.device-view/device-view.hbs
index 8f77b561b..86e345235 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.device-view/device-view.hbs
+++ 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.device-view/device-view.hbs
@@ -24,15 +24,38 @@
{{/zone}}
{{#zone "device-thumbnail"}}
-
+
+{{/zone}}
+
+{{#zone "device-details-header"}}
+
+ {{device.enrolmentInfo.owner}}'s {{device.name}}
+
+
+
+
+ Ownership - {{device.enrolmentInfo.ownership}}
+ Device is
+
+ {{#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}}
+
+
{{/zone}}
{{#zone "device-opetations"}}
-
- Operations
-
-
- {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams
+
+
+
Device Operations
+
+ {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams
encodedFeaturePayloads=encodedFeaturePayloads}}
{{/zone}}
@@ -42,10 +65,6 @@
data-toggle="tab" aria-controls="device_statistics">Device
Statistics
-
Operations Log
-
Map
{{/zone}}
{{#zone "device-view-tab-contents"}}
@@ -54,43 +73,4 @@
Device Statistics
{{unit "cdmf.unit.device.type.raspberrypi.realtime.analytics-view" device=device}}
-
-
-
-
-
-
-
-
- Loading Operations Log . . .
-
-
-
-
-
- Not available yet
-
-
-
-
-
-
-{{/zone}}
\ No newline at end of file
+{{/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 09121c01f..a9cb25acb 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
@@ -50,25 +50,27 @@
{{/zone}}
{{#zone "device-details"}}
- {{#if device.deviceInfoAvailable}}
- {{#if device.BatteryLevel}}
- {{device.BatteryLevel.value}}%
- {{/if}}
- {{#if device.ramUsage}}
- {{device.ramUsage.value}}%
- {{/if}}
- {{#if device.internalMemory}}
- {{device.internalMemory.usage}}
- GB/{{device.internalMemory.total}}GB
- {{/if}}
- {{#if device.externalMemory}}
- {{device.externalMemory.usage}}
- GB/{{device.externalMemory.total}}GB
+
+ {{#if device.deviceInfoAvailable}}
+ {{#if device.BatteryLevel}}
+
{{device.BatteryLevel.value}}%
+ {{/if}}
+ {{#if device.ramUsage}}
+
{{device.ramUsage.value}}%
+ {{/if}}
+ {{#if device.internalMemory}}
+
{{device.internalMemory.usage}}
+ GB/{{device.internalMemory.total}}GB
+ {{/if}}
+ {{#if device.externalMemory}}
+
{{device.externalMemory.usage}}
+ GB/{{device.externalMemory.total}}GB
+ {{/if}}
+ {{else}}
+
Battery, RAM and Storage related information are not
+ available yet.
{{/if}}
- {{else}}
-
Battery, RAM and Storage related information are not
- available yet.
- {{/if}}
+
{{/zone}}
{{#zone "device-details-tab-injected"}}
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 35eac6114..1fb4ef320 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
@@ -52,21 +52,23 @@
{{/zone}}
{{#zone "device-details"}}
- {{#if device.deviceInfoAvailable}}
- {{#if device.BatteryLevel}}
- {{device.BatteryLevel.value}}%
+
+ {{#if device.deviceInfoAvailable}}
+ {{#if device.BatteryLevel}}
+
{{device.BatteryLevel.value}}%
+ {{/if}}
+ {{#if device.ramUsage}}
+
{{device.ramUsage.value}} MB
+ {{/if}}
+ {{#if device.internalMemory}}
+
{{device.internalMemory.value}} GB
+
+ {{/if}}
+ {{else}}
+
Battery, RAM and Storage related information are not
+ available yet.
{{/if}}
- {{#if device.ramUsage}}
-
{{device.ramUsage.value}} MB
- {{/if}}
- {{#if device.internalMemory}}
-
{{device.internalMemory.value}} GB
-
- {{/if}}
- {{else}}
-
Battery, RAM and Storage related information are not
- available yet.
- {{/if}}
+
{{/zone}}
{{#zone "device-details-tab-injected"}}