diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
index c26c6d41..33b6154e 100644
--- a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
@@ -28,12 +28,9 @@
     <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 class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                      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 class="active">
+                    <a class="list-group-item" href="#device_statistics" role="tab" data-toggle="tab"
+                       aria-controls="device_statistics">Device Statistics</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -47,30 +44,6 @@
                     <div class="panel-heading">Device Statistics</div>
                     {{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-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 . . .
-                            <br>
-                            <br>
-                        </div>
-                        <div id="policy-list-container">
-                            <div class="panel-body">
-                                Not available yet
-                            </div>
-                            <br class="c-both"/>
-                        </div>
-                    </div>
-                </div>
                 <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
                      aria-labelledby="event_log">
                     <div class="panel-heading">Operations Log <span><a href="#"
diff --git a/modules/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs b/modules/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
index 18f74e53..471dc3a6 100644
--- a/modules/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
+++ b/modules/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
@@ -19,13 +19,10 @@
 {{#zone "device-detail-properties"}}
     <div class="media">
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
-            <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                  data-toggle="tab" aria-controls="device_statistics">Device
-                Statistics</a>
-            </li>
             <ul class="list-group" role="tablist">
-                <li><a class="list-group-item" href="#policies" role="tab"
-                       data-toggle="tab" aria-controls="policies">Policies</a>
+                <li class="active">
+                    <a class="list-group-item" href="#device_statistics" role="tab" data-toggle="tab"
+                       aria-controls="device_statistics">Device Statistics</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -40,41 +37,6 @@
                     <div class="panel-heading">Device Statistics</div>
                     {{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 Policies . . .
-                                <br>
-                                <br>
-                            </div>
-                            <div id="policy-list-container">
-                                <div class="panel-body">
-                                    No policies found
-                                </div>
-                                <br class="c-both"/>
-                            </div>
-                        </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">
                     <div class="panel-heading">Operations Log <span><a href="#"
diff --git a/modules/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs b/modules/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
index 47a4ca68..4a037a61 100644
--- a/modules/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
+++ b/modules/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
@@ -46,12 +46,10 @@
     <div class="media">
 
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
-            <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                  data-toggle="tab" aria-controls="device_statistics">Device Statistics</a>
-            </li>
             <ul class="list-group" role="tablist">
-                <li><a class="list-group-item" href="#policies" role="tab"
-                       data-toggle="tab" aria-controls="policies">Policies</a>
+                <li class="active">
+                    <a class="list-group-item" href="#device_statistics" role="tab" data-toggle="tab"
+                       aria-controls="device_statistics">Device Statistics</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -64,38 +62,6 @@
                     <div class="panel-heading">Device Statistics</div>
                     {{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 Policies . . .
-                                <br>
-                                <br>
-                            </div>
-                            <div id="policy-list-container">
-                                <div class="panel-body">
-                                    No policies found
-                                </div>
-                                <br class="c-both"/>
-                            </div>
-                        </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">
                     <div class="panel-heading">Operations Log <span><a href="#"
diff --git a/modules/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs b/modules/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
index c1741788..57f3a6c0 100644
--- a/modules/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
+++ b/modules/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
@@ -46,13 +46,10 @@
 {{#zone "device-detail-properties"}}
     <div class="media">
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
-            <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                  data-toggle="tab" aria-controls="device_statistics">Device
-                                                                                      Statistics</a>
-            </li>
             <ul class="list-group" role="tablist">
-                <li><a class="list-group-item" href="#policies" role="tab"
-                       data-toggle="tab" aria-controls="policies">Policies</a>
+                <li class="active">
+                    <a class="list-group-item" href="#device_statistics" role="tab" data-toggle="tab"
+                       aria-controls="device_statistics">Device Statistics</a>
                 </li>
                 <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
                        aria-controls="event_log">Operations Log</a></li>
@@ -65,39 +62,6 @@
                     <div class="panel-heading">Device Statistics</div>
                     {{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 Policies . . .
-                                <br>
-                                <br>
-                            </div>
-                            <div id="policy-list-container">
-                                <div class="panel-body">
-                                    No policies found
-                                </div>
-                                <br class="c-both"/>
-                            </div>
-                        </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">
                     <div class="panel-heading">Operations Log <span><a href="#"
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
index c1741788..f5876559 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
@@ -46,11 +46,11 @@
 {{#zone "device-detail-properties"}}
     <div class="media">
         <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
-            <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                  data-toggle="tab" aria-controls="device_statistics">Device
-                                                                                      Statistics</a>
-            </li>
             <ul class="list-group" role="tablist">
+                <li class="active">
+                    <a class="list-group-item" href="#device_statistics" role="tab" data-toggle="tab"
+                       aria-controls="device_statistics">Device Statistics</a>
+                </li>
                 <li><a class="list-group-item" href="#policies" role="tab"
                        data-toggle="tab" aria-controls="policies">Policies</a>
                 </li>