From e46fdc0f951a324bbaa497f6e861ea90645dd628 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Fri, 22 Jan 2016 18:57:55 +0530
Subject: [PATCH] Add policy specific functionality

---
 .../iot/service/ConfigurationServiceImpl.java |   7 +-
 .../device-view.hbs                           |  22 +-
 .../device-view.hbs                           |  22 +-
 .../device-view.hbs                           |  22 +-
 .../device-view.hbs                           |  22 +-
 .../public/js/device-detail.js                | 197 ------------------
 .../public/js/load-map.js                     |  55 -----
 .../public/templates/applications-list.hbs    |  12 --
 .../public/templates/operations-log.hbs       |  24 ---
 .../public/templates/policy-compliance.hbs    |  79 -------
 .../app/units/iot.unit.policy.edit/edit.hbs   |   2 +-
 .../public/js/policy-create.js                |  10 +-
 .../units/iot.unit.policy.wizard/wizard.hbs   |   4 +-
 .../device-view.hbs                           |  22 +-
 .../device-view.hbs                           |  22 +-
 .../device-view.hbs                           |  32 ++-
 .../public/js/device-detail.js                | 149 ++-----------
 .../app/units/mdm.unit.policy.edit/edit.hbs   |   2 +-
 .../units/mdm.unit.policy.wizard/wizard.hbs   |   4 +-
 19 files changed, 143 insertions(+), 566 deletions(-)
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/device-detail.js
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/load-map.js
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/applications-list.hbs
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/operations-log.hbs
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/policy-compliance.hbs

diff --git a/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/src/main/java/org/wso2/carbon/device/mgt/iot/service/ConfigurationServiceImpl.java b/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/src/main/java/org/wso2/carbon/device/mgt/iot/service/ConfigurationServiceImpl.java
index 3b3322f30d..8925117a98 100644
--- a/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/src/main/java/org/wso2/carbon/device/mgt/iot/service/ConfigurationServiceImpl.java
+++ b/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/src/main/java/org/wso2/carbon/device/mgt/iot/service/ConfigurationServiceImpl.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.device.mgt.iot.service;
 
+import org.wso2.carbon.device.mgt.iot.config.server.DeviceManagementConfigurationManager;
 import org.wso2.carbon.device.mgt.iot.config.server.datasource.ControlQueue;
 import org.wso2.carbon.device.mgt.iot.config.server.datasource.DeviceManagementConfiguration;
 import org.wso2.carbon.device.mgt.iot.config.server.datasource.DeviceMgtServerInfo;
@@ -26,16 +27,16 @@ public class ConfigurationServiceImpl implements ConfigurationService {
 
     @Override
     public DeviceManagementConfiguration getDeviceCloudMgtConfig() {
-        return null;
+        return DeviceManagementConfigurationManager.getInstance().getDeviceCloudMgtConfig();
     }
 
     @Override
     public ControlQueue getControlQueue(String name) {
-        return null;
+        return DeviceManagementConfigurationManager.getInstance().getControlQueue(name);
     }
 
     @Override
     public DeviceMgtServerInfo getDeviceManagementServerInfo() {
-        return null;
+        return DeviceManagementConfigurationManager.getInstance().getDeviceManagementServerInfo();
     }
 }
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index cbea9cfbe6..6220c96528 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -20,8 +20,8 @@
                                       data-toggle="tab" aria-controls="device_statistics">Device
                                                                                           Statistics</a>
                 </li>
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#device_location" role="tab" data-toggle="tab"
                        aria-controls="device_location">Device Location</a></li>
@@ -38,28 +38,32 @@
                     {{unit "iot.unit.device.stats" device=device}}
                 </div>
 
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="device_location" role="tabpanel"
                      aria-labelledby="device_location">
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
index 48f2bc2d9b..5d30451bfa 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
@@ -27,8 +27,8 @@
                                       data-toggle="tab" aria-controls="device_statistics">Device
                                                                                           Statistics</a>
                 </li>
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -43,28 +43,32 @@
                     {{unit "iot.unit.device.stats" device=device}}
                 </div>
 
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
index c31f884e4b..5f582f5dae 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
@@ -23,8 +23,8 @@
     <div class="media">
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
             <ul class="list-group" role="tablist">
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -33,28 +33,32 @@
         <div class="media-body add-padding-left-5x remove-padding-xs tab-content">
             <div class="panel-group tab-content">
 
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/device-view.hbs b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/device-view.hbs
index 79769b5a86..16a9e3d41c 100644
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/device-view.hbs
+++ b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/device-view.hbs
@@ -16,8 +16,8 @@
     <div class="media">
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
             <ul class="list-group" role="tablist">
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -26,28 +26,32 @@
         <div class="media-body add-padding-left-5x remove-padding-xs tab-content">
 
             <div class="panel-group tab-content">
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/device-detail.js b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/device-detail.js
deleted file mode 100644
index 730a132be5..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/device-detail.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-
-(function () {
-    var deviceId = $(".device-id");
-    var deviceIdentifier = deviceId.data("deviceid");
-    var deviceType = deviceId.data("type");
-    var payload = [deviceIdentifier];
-    var operationTable;
-    if (deviceType == "ios") {
-        var serviceUrl = "/ios/operation/deviceinfo";
-    } else if (deviceType == "android") {
-        var serviceUrl = "/mdm-android-agent/operation/device-info";
-    }
-    if(serviceUrl){
-        invokerUtil.post(serviceUrl, payload,
-            function(message){
-                console.log(message);
-            }, function (message) {
-                console.log(message);
-            });
-    }
-    $(document).ready(function(){
-        $(".panel-body").removeClass("hidden");
-        $("#loading-content").remove();
-        loadOperationBar(deviceType);
-        loadOperationsLog();
-        loadApplicationsList();
-        loadPolicyCompliance();
-
-        $("#refresh-policy").click(function () {
-            $('#policy-spinner').removeClass('hidden');
-            loadPolicyCompliance();
-        });
-
-        $("#refresh-apps").click(function () {
-            $('#apps-spinner').removeClass('hidden');
-            loadApplicationsList();
-        });
-
-        $("#refresh-operations").click(function () {
-            $('#operations-spinner').removeClass('hidden');
-            loadOperationsLog(true);
-        });
-
-    });
-
-    function loadOperationsLog(update) {
-        var operationsLog = $("#operations-log");
-        var deviceListingSrc = operationsLog.attr("src");
-        var deviceId = operationsLog.data("device-id");
-        var deviceType = operationsLog.data("device-type");
-
-        $.template("operations-log", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/"+deviceType+"/"+deviceId;
-
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#operations-spinner').addClass('hidden');
-                var viewModel = {};
-                viewModel.operations = data;
-                if(data.length > 0){
-                    var content = template(viewModel);
-                    if(!update) {
-                        $("#operations-log-container").html(content);
-                        operationTable = $('#operations-log-table').datatables_extended();
-                    }else{
-                        $('#operations-log-table').dataTable().fnClearTable();
-                        for(var i=0; i < data.length; i++) {
-                            var status;
-                            if(data[i].status == "COMPLETED") {
-                                status = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
-                            } else if(data[i].status == "PENDING") {
-                                status = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
-                            } else if(data[i].status == "ERROR") {
-                                status = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
-                            } else if(data[i].status == "IN_PROGRESS") {
-                                status = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
-                            }
-
-                            $('#operations-log-table').dataTable().fnAddData([
-                                data[i].code,
-                                status,
-                                data[i].createdTimeStamp
-                            ]);
-                        }
-                    }
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function(message){
-                    console.log(message);
-            });
-        });
-
-    }
-
-    function loadApplicationsList() {
-        var applicationsList = $("#applications-list");
-        var deviceListingSrc = applicationsList.attr("src");
-        var deviceId = applicationsList.data("device-id");
-        var deviceType = applicationsList.data("device-type");
-
-        $.template("application-list", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/"+deviceType+"/"+deviceId+"/apps";
-
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#apps-spinner').addClass('hidden');
-                var viewModel = {};
-                if(data != null && data.length > 0) {
-                    for (var i = 0; i < data.length; i++) {
-                        data[i].name = data[i].name.replace(/[^\w\s]/gi, ' ');
-                        data[i].name = data[i].name.replace(/[0-9]/g, ' ');
-                    }
-                }
-                viewModel.applications = data;
-                viewModel.deviceType = deviceType;
-                if(data.length > 0){
-                    var content = template(viewModel);
-                    $("#applications-list-container").html(content);
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function(message){
-                    console.log(message);
-            });
-        });
-    }
-
-    function loadPolicyCompliance() {
-        var policyCompliance = $("#policy-view");
-        var policySrc = policyCompliance.attr("src");
-        var deviceId = policyCompliance.data("device-id");
-        var deviceType = policyCompliance.data("device-type");
-        var activePolicy = null;
-
-        $.template("policy-view", policySrc, function (template) {
-            var serviceURLPolicy ="/devicemgt_admin/policies/"+deviceType+"/"+deviceId+"/active-policy"
-            var serviceURLCompliance = "/devicemgt_admin/policies/"+deviceType+"/"+deviceId;
-
-            var successCallbackCompliance = function (data) {
-                var viewModel = {};
-                viewModel.policy = activePolicy;
-                viewModel.deviceType = deviceType;
-                if(data != null && data.complianceFeatures!= null && data.complianceFeatures != undefined && data.complianceFeatures.length > 0) {
-                    viewModel.compliance = "NON-COMPLIANT";
-                    viewModel.complianceFeatures = data.complianceFeatures;
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                } else {
-                    viewModel.compliance = "COMPLIANT";
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                    $("#policy-compliance-table").addClass("hidden");
-                }
-
-            };
-
-            var successCallbackPolicy = function (data) {
-                data = JSON.parse(data);
-                $('#policy-spinner').addClass('hidden');
-                if(data != null && data.active == true){
-                    activePolicy = data;
-                    invokerUtil.get(serviceURLCompliance,
-                        successCallbackCompliance, function(message){
-                            console.log(message);
-                    });
-                }
-            };
-
-            invokerUtil.get(serviceURLPolicy,
-                successCallbackPolicy, function(message){
-                    console.log(message);
-            });
-        });
-
-    }
-
-}());
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/load-map.js b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/load-map.js
deleted file mode 100644
index 92ae2d2d8d..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/js/load-map.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-
-$(document).ready(function(){
-    if (document.getElementById('device-location')){
-        loadMap();
-    }
-});
-
-function loadMap() {
-    var map;
-    function initialize() {
-        var mapOptions = {
-            zoom: 18
-        };
-        var lat = $("#device-location").data("lat");
-        var long = $("#device-location").data("long");
-
-        if(lat != null && lat != undefined && lat != "" && long != null && long != undefined && long != "") {
-            $("#map-error").hide();
-            $("#device-location").show();
-            map = new google.maps.Map(document.getElementById('device-location'),
-                mapOptions);
-
-            var pos = new google.maps.LatLng(lat,
-                long);
-            var marker = new google.maps.Marker({
-                position: pos,
-                map: map
-            });
-
-            map.setCenter(pos);
-        }else{
-            $("#device-location").hide();
-            $("#map-error").show();
-        }
-
-    }
-    google.maps.event.addDomListener(window, 'load', initialize);
-}
\ No newline at end of file
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/applications-list.hbs b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/applications-list.hbs
deleted file mode 100644
index 8fba28621b..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/applications-list.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="wr-app-listing">
-    <div class="wr-applist">
-        {{#each applications}}
-                <a style="text-align: center;width: 100px;height: 100px;">
-                    {{#equal platform "android"}}<i class="fw fw-android"></i>{{/equal}}
-                    {{#equal platform "ios"}}<i class="fw fw-apple"></i>{{/equal}}
-                    {{#equal platform "windows"}}<i class="fw fw-windows"></i>{{/equal}}
-                    <span>{{name}}</span>
-                </a>
-        {{/each}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/operations-log.hbs b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/operations-log.hbs
deleted file mode 100644
index cc5db5117a..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/operations-log.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<table class="table table-striped table-hover table-bordered display data-table" id="operations-log-table">
-    <thead>
-        <tr class="sort-row">
-            <th>Operation Code</th>
-            <th>Status</th>
-            <th>Request created at</th>
-        </tr>
-    </thead>
-    <tbody>
-    {{#each operations}}
-        <tr data-type="selectable" data-id="{{id}}">
-            <td data-display="{{code}}" data-grid-label="Code">{{code}}</td>
-            <td data-display="{{status}}" data-grid-label="Status">
-                {{#equal status "COMPLETED"}}<span><i class="fw fw-ok icon-success"></i> Completed</span>{{/equal}}
-                {{#equal status "PENDING"}}<span><i class="fw fw-warning icon-warning"></i> Pending</span>{{/equal}}
-                {{#equal status "ERROR"}}<span><i class="fw fw-error icon-danger"></i> Error</span>{{/equal}}
-                {{#equal status "IN_PROGRESS"}}<span><i class="fw fw-ok icon-warning"></i> In Progress</span>{{/equal}}
-            </td>
-            <td data-display="{{createdTimeStamp}}" data-grid-label="Created Timestamp">{{createdTimeStamp}}</td>
-        </tr>
-    {{/each}}
-    <br class="c-both" />
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/policy-compliance.hbs b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/policy-compliance.hbs
deleted file mode 100644
index 6dabda7870..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.device-view/public/templates/policy-compliance.hbs
+++ /dev/null
@@ -1,79 +0,0 @@
-<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-ok 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="/mdm/policies/view?id={{policy.id}}" class="cu-btn-inner policy-view-link" data-id="{{id}}">
-                    <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-view fw-stack-1x"></i>
-                    </span>
-                    View
-                </a>
-            </span>
-        </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">
-            <th>Feature</th>
-            <th>Compliance</th>
-        </tr>
-    </thead>
-    <tbody>
-    {{#each complianceFeatures}}
-        <tr data-type="selectable">
-            <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
-            <td data-display="{{compliance}}" data-grid-label="Status">
-                {{#equal compliance true}}<span><i class="fw fw-ok icon-success"></i> Compliant</span>{{/equal}}
-                {{#equal compliance false}}<span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>{{/equal}}
-            </td>
-        </tr>
-    {{/each}}
-    <br class="c-both" />
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
index 236884f289..4418289187 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
@@ -41,7 +41,7 @@
                         data-direct="{{@app.context}}/policies/">
                     View policy list
                 </button>
-                <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
+                <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
index fb89d22f31..84e9886436 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
@@ -267,6 +267,7 @@ function publishToDevice() {
         "description": policy["description"],
         "compliance": policy["selectedNonCompliantAction"],
         "ownershipType": "ANY",
+        "deviceId": getParameterByName('deviceId'),
         "profile": {
             "profileName": policy["policyName"],
             "deviceType": {
@@ -659,4 +660,11 @@ $(document).ready(function () {
             $("." + nextStep).removeClass("hidden");
         }
     });
-});
\ No newline at end of file
+});
+
+function getParameterByName(name) {
+    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+            results = regex.exec(location.search);
+    return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
index b579f8d98f..4cc6fa2726 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
@@ -48,7 +48,7 @@
                         data-direct="{{@app.context}}/policies">
                     View policy list
                 </button>
-                <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
+                <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
@@ -229,7 +229,7 @@
                             </div>
                         </div>
                         <div class="wr-input-control wr-btn-grp">
-                            <a href="{{@app.context}}/policies/add-policy"
+                            <a href="javascript:window.history.back()"
                                class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-profile" data-next="policy-platform">
                                 Back
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
index c646f7e932..ff32274cc5 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
@@ -27,8 +27,8 @@
                                       data-toggle="tab" aria-controls="device_statistics">Device
                     Statistics</a>
                 </li>
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -43,28 +43,32 @@
                     {{unit "iot.unit.device.stats" device=device}}
                 </div>
 
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
index 537a8243d4..c6d599d8e9 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
@@ -27,8 +27,8 @@
                                       data-toggle="tab" aria-controls="device_statistics">Device
                                                                                        Statistics</a>
                 </li>
-                <li><a class="list-group-item" href="#policy_compliance" role="tab"
-                       data-toggle="tab" aria-controls="policy_compliance">Policy Compliance</a>
+                <li><a class="list-group-item" href="#policies" role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -43,28 +43,32 @@
                     {{unit "iot.unit.device.stats" device=device}}
                 </div>
 
-                <div class="panel panel-default tab-pane" id="policy_compliance" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-heading">Policy Compliance <span><a href="#"
-                                                                          id="refresh-policy"><i
-                            class="fw fw-refresh"></i></a></span></div>
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="fw fw-settings fw-spin fw-2x"></i>
                             &nbsp;&nbsp;&nbsp;
-                            Loading Policy Compliance . . .
+                            Loading Policies . . .
                             <br>
                             <br>
                         </div>
                         <div id="policy-list-container">
                             <div class="panel-body">
-                                Not available yet
+                                No policies found
                             </div>
                             <br class="c-both"/>
                         </div>
                     </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
                 </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 6b9500151a..fa58dc4d6b 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -8,6 +8,10 @@
                                       aria-controls="device_details">Device
                                                                      Details</a>
                 </li>
+                <li><a class="list-group-item" href="#policies"
+                       role="tab"
+                       data-toggle="tab" aria-controls="policies">Policies</a>
+                </li>
                 <li><a class="list-group-item" href="#policy_compliance"
                        role="tab"
                        data-toggle="tab" aria-controls="policy_compliance">Policy
@@ -36,7 +40,33 @@
                      aria-labelledby="device_details">
                     {{unit "cdmf.unit.device.details" device=device}}
                 </div>
-
+                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+                     aria-labelledby="policies">
+                    <div class="panel-heading">Policies</div>
+                    <div class="panel-body">
+                        <div id="policy-spinner" class="wr-advance-operations-init hidden">
+                            <br>
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <i class="fw fw-settings fw-spin fw-2x"></i>
+                            &nbsp;&nbsp;&nbsp;
+                            Loading Policies . . .
+                            <br>
+                            <br>
+                        </div>
+                        <div id="policy-list-container">
+                            <div class="panel-body">
+                                No policies found
+                            </div>
+                            <br class="c-both"/>
+                        </div>
+                    </div>
+                    <a class="padding-left"
+                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                                        <span class="fw-stack">
+                                            <i class="fw fw-ring fw-stack-2x"></i>
+                                            <i class="fw fw-policy fw-stack-1x"></i>
+                                        </span> Add device specific policy</a>
+                </div>
                 <div class="panel panel-default tab-pane" id="policy_compliance"
                      role="tabpanel" aria-labelledby="policy_compliance">
                     <div class="panel-heading">Policy Compliance <span><a
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index 730a132be5..c33daba6d2 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * 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
+ * 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
+ * "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.
  */
@@ -22,95 +22,25 @@
     var deviceType = deviceId.data("type");
     var payload = [deviceIdentifier];
     var operationTable;
-    if (deviceType == "ios") {
-        var serviceUrl = "/ios/operation/deviceinfo";
-    } else if (deviceType == "android") {
-        var serviceUrl = "/mdm-android-agent/operation/device-info";
-    }
-    if(serviceUrl){
-        invokerUtil.post(serviceUrl, payload,
-            function(message){
-                console.log(message);
-            }, function (message) {
+    var serviceUrl = "/mdm-android-agent/operation/device-info";
+    invokerUtil.post(serviceUrl, payload,
+                     function (message) {
+                         console.log(message);
+                     }, function (message) {
                 console.log(message);
             });
-    }
-    $(document).ready(function(){
+    $(document).ready(function () {
         $(".panel-body").removeClass("hidden");
         $("#loading-content").remove();
-        loadOperationBar(deviceType);
-        loadOperationsLog();
         loadApplicationsList();
-        loadPolicyCompliance();
-
-        $("#refresh-policy").click(function () {
-            $('#policy-spinner').removeClass('hidden');
-            loadPolicyCompliance();
-        });
 
         $("#refresh-apps").click(function () {
             $('#apps-spinner').removeClass('hidden');
             loadApplicationsList();
         });
 
-        $("#refresh-operations").click(function () {
-            $('#operations-spinner').removeClass('hidden');
-            loadOperationsLog(true);
-        });
-
     });
 
-    function loadOperationsLog(update) {
-        var operationsLog = $("#operations-log");
-        var deviceListingSrc = operationsLog.attr("src");
-        var deviceId = operationsLog.data("device-id");
-        var deviceType = operationsLog.data("device-type");
-
-        $.template("operations-log", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/"+deviceType+"/"+deviceId;
-
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#operations-spinner').addClass('hidden');
-                var viewModel = {};
-                viewModel.operations = data;
-                if(data.length > 0){
-                    var content = template(viewModel);
-                    if(!update) {
-                        $("#operations-log-container").html(content);
-                        operationTable = $('#operations-log-table').datatables_extended();
-                    }else{
-                        $('#operations-log-table').dataTable().fnClearTable();
-                        for(var i=0; i < data.length; i++) {
-                            var status;
-                            if(data[i].status == "COMPLETED") {
-                                status = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
-                            } else if(data[i].status == "PENDING") {
-                                status = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
-                            } else if(data[i].status == "ERROR") {
-                                status = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
-                            } else if(data[i].status == "IN_PROGRESS") {
-                                status = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
-                            }
-
-                            $('#operations-log-table').dataTable().fnAddData([
-                                data[i].code,
-                                status,
-                                data[i].createdTimeStamp
-                            ]);
-                        }
-                    }
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function(message){
-                    console.log(message);
-            });
-        });
-
-    }
-
     function loadApplicationsList() {
         var applicationsList = $("#applications-list");
         var deviceListingSrc = applicationsList.attr("src");
@@ -118,13 +48,13 @@
         var deviceType = applicationsList.data("device-type");
 
         $.template("application-list", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/"+deviceType+"/"+deviceId+"/apps";
+            var serviceURL = "/devicemgt_admin/operations/" + deviceType + "/" + deviceId + "/apps";
 
             var successCallback = function (data) {
                 data = JSON.parse(data);
                 $('#apps-spinner').addClass('hidden');
                 var viewModel = {};
-                if(data != null && data.length > 0) {
+                if (data != null && data.length > 0) {
                     for (var i = 0; i < data.length; i++) {
                         data[i].name = data[i].name.replace(/[^\w\s]/gi, ' ');
                         data[i].name = data[i].name.replace(/[0-9]/g, ' ');
@@ -132,66 +62,17 @@
                 }
                 viewModel.applications = data;
                 viewModel.deviceType = deviceType;
-                if(data.length > 0){
+                if (data.length > 0) {
                     var content = template(viewModel);
                     $("#applications-list-container").html(content);
                 }
 
             };
             invokerUtil.get(serviceURL,
-                successCallback, function(message){
-                    console.log(message);
-            });
-        });
-    }
-
-    function loadPolicyCompliance() {
-        var policyCompliance = $("#policy-view");
-        var policySrc = policyCompliance.attr("src");
-        var deviceId = policyCompliance.data("device-id");
-        var deviceType = policyCompliance.data("device-type");
-        var activePolicy = null;
-
-        $.template("policy-view", policySrc, function (template) {
-            var serviceURLPolicy ="/devicemgt_admin/policies/"+deviceType+"/"+deviceId+"/active-policy"
-            var serviceURLCompliance = "/devicemgt_admin/policies/"+deviceType+"/"+deviceId;
-
-            var successCallbackCompliance = function (data) {
-                var viewModel = {};
-                viewModel.policy = activePolicy;
-                viewModel.deviceType = deviceType;
-                if(data != null && data.complianceFeatures!= null && data.complianceFeatures != undefined && data.complianceFeatures.length > 0) {
-                    viewModel.compliance = "NON-COMPLIANT";
-                    viewModel.complianceFeatures = data.complianceFeatures;
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                } else {
-                    viewModel.compliance = "COMPLIANT";
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                    $("#policy-compliance-table").addClass("hidden");
-                }
-
-            };
-
-            var successCallbackPolicy = function (data) {
-                data = JSON.parse(data);
-                $('#policy-spinner').addClass('hidden');
-                if(data != null && data.active == true){
-                    activePolicy = data;
-                    invokerUtil.get(serviceURLCompliance,
-                        successCallbackCompliance, function(message){
-                            console.log(message);
+                            successCallback, function (message) {
+                        console.log(message);
                     });
-                }
-            };
-
-            invokerUtil.get(serviceURLPolicy,
-                successCallbackPolicy, function(message){
-                    console.log(message);
-            });
         });
-
     }
 
 }());
diff --git a/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs b/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
index 5a356d80bb..e467aaffbf 100644
--- a/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
+++ b/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
@@ -26,7 +26,7 @@
                             data-direct="{{@app.context}}/policies/">
                         &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
                     </button>
-                    <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
+                    <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
diff --git a/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/wizard.hbs b/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/wizard.hbs
index 81ec81d942..ade2d3f5f9 100644
--- a/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/wizard.hbs
+++ b/features/device-mgt-mdm-feature/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/wizard.hbs
@@ -45,7 +45,7 @@
                         data-direct="{{@app.context}}/policies">
                     &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
                 </button>
-                <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
+                <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
@@ -243,7 +243,7 @@
                             </div>
                         </div>
                         <div class="wr-input-control wr-btn-grp">
-                            <a href="{{@app.context}}/policies/add-policy"
+                            <a href="javascript:window.history.back()"
                                class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-profile" data-next="policy-platform">
                                 &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;