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.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/device-view.js
index 1ab8d6b06..76b097605 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.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/device-view.js
@@ -84,49 +84,30 @@ function onRequest(context) {
                         viewModel["model"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"];
                     }
                     if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]) {
-                        if (deviceType == "android") {
                             viewModel["BatteryLevel"] = {};
                             viewModel["BatteryLevel"]["value"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BATTERY_LEVEL"];
 
                             viewModel["internalMemory"] = {};
-                            viewModel["internalMemory"]["total"] = Math.
-                                round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] * 100) / 100;
+                            viewModel["internalMemory"]["total"] = replaceNaNVal(Math.
+                                round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] * 100) / 100);
                             if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] != 0) {
-                                viewModel["internalMemory"]["usage"] = Math.round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] -
-                                    filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_AVAILABLE_MEMORY"]) * 100) / 100;
-                                if(isNaN(viewModel["internalMemory"]["usage"]))
-                                  viewModel["internalMemory"]["usage"] = "N/A";
+                                viewModel["internalMemory"]["usage"] = replaceNaNVal(Math.round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] -
+                                    filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_AVAILABLE_MEMORY"]) * 100) / 100);
                             } else {
                                 viewModel["internalMemory"]["usage"] = 0;
                             }
 
                             viewModel["externalMemory"] = {};
-                            viewModel["externalMemory"]["total"] = Math.
-                                round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 100) / 100;
+                            viewModel["externalMemory"]["total"] = replaceNaNVal(Math.
+                                round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 100) / 100);
                             if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] != 0) {
-                                viewModel["externalMemory"]["usage"] = Math.
+                                viewModel["externalMemory"]["usage"] = replaceNaNVal(Math.
                                     round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] -
                                         filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_AVAILABLE_MEMORY"])
-                                        / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 10000) / 100;
+                                        / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 10000) / 100);
                             } else {
                                 viewModel["externalMemory"]["usage"] = 0;
                             }
-                        } else if (deviceType == "ios") {
-                            viewModel["BatteryLevel"] = {};
-                            viewModel["BatteryLevel"]["value"] = Math. round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BatteryLevel"] * 10000) / 100;
-
-                            viewModel["internalMemory"] = {};
-                            viewModel["internalMemory"]["total"] = Math.
-                                round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] * 100) / 100;
-                            if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] != 0) {
-                                viewModel["internalMemory"]["usage"] = Math.
-                                    round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] -
-                                        filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["AvailableDeviceCapacity"])
-                                        / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] * 10000) / 100;
-                            } else {
-                                viewModel["internalMemory"]["usage"] = 0;
-                            }
-                        }
                     }
                 }
             }
@@ -160,36 +141,32 @@ function onRequest(context) {
 
                 viewModel["ramUsage"] = {};
                 if (filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] != 0) {
-                    viewModel["ramUsage"]["value"] = Math.
+                    viewModel["ramUsage"]["value"] = replaceNaNVal(Math.
                         round((filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] -
                             filteredDeviceData["latestDeviceInfo"]["availableRAMMemory"])
-                            / filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] * 10000) / 100;
-                        if(isNaN(viewModel["ramUsage"]["value"]))
-                          viewModel["ramUsage"]["value"] = "N/A";
+                            / filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] * 10000) / 100);
                 } else {
                     viewModel["ramUsage"]["value"] = 0;
                 }
 
                 viewModel["internalMemory"] = {};
-                viewModel["internalMemory"]["total"] = Math.
-                    round(filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 100) / 100;
+                viewModel["internalMemory"]["total"] = replaceNaNVal(Math.
+                    round(filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 100) / 100);
                 if (filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] != 0) {
-                    viewModel["internalMemory"]["usage"] = Math.round((filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] -
-                        filteredDeviceData["latestDeviceInfo"]["internalAvailableMemory"]) * 100) / 100;
-                    if(isNaN(viewModel["internalMemory"]["usage"]))
-                      viewModel["internalMemory"]["usage"] = "N/A";
+                    viewModel["internalMemory"]["usage"] = replaceNaNVal(Math.round((filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] -
+                        filteredDeviceData["latestDeviceInfo"]["internalAvailableMemory"]) * 100) / 100);
                 } else {
                     viewModel["internalMemory"]["usage"] = 0;
                 }
 
                 viewModel["externalMemory"] = {};
-                viewModel["externalMemory"]["total"] = Math.
-                    round(filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 100) / 100;
+                viewModel["externalMemory"]["total"] = replaceNaNVal(Math.
+                    round(filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 100) / 100);
                 if (filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] != 0) {
-                    viewModel["externalMemory"]["usage"] = Math.
+                    viewModel["externalMemory"]["usage"] = replaceNaNVal(Math.
                         round((filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] -
                             filteredDeviceData["latestDeviceInfo"]["externalAvailableMemory"])
-                            / filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 10000) / 100;
+                            / filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 10000) / 100);
                 } else {
                     viewModel["externalMemory"]["usage"] = 0;
                 }
@@ -222,4 +199,11 @@ function onRequest(context) {
     deviceViewData["isCloud"] = devicemgtProps['isCloud'];
     deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
     return deviceViewData;
+
+    function replaceNaNVal(val){
+        if(isNaN(val)){
+            return "N/A";
+        }
+        return val;
+    }
 }