diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
index ea2b91a78c..a650c9e151 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
@@ -13,61 +13,59 @@
         <div class="page-content-wrapper">
             <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
                 <div class="media">
-                    <div class="media-body asset-desc add-padding-left-5x">
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                            Policy Overview
-                        </div>
-                        {{#defineZone "policy-detail-properties"}}
-                            <table class="table table-responsive table-striped" id="members">
-                                <tbody>
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
-                                    <td id="policy-platform" style="padding:10px 15px;"></td>
-                                </tr>
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
-                                    <td id="policy-assignment" style="padding:10px 15px;"></td>
-                                </tr>
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
-                                    <td id="policy-action" style="padding:10px 15px;"></td>
-                                </tr>
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px;">Status</td>
-                                    <td id="policy-status" style="padding:10px 15px;"></td>
-                                </tr>
-                                <tr role="row" id="users-row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
-                                    <td id="policy-users" style="padding:10px 15px;"></td>
-                                </tr>
-                                <tr role="row" id="roles-row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
-                                    <td id="policy-roles" style="padding:10px 15px;"></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        {{/defineZone}}
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
-                        </div>
-                        <div class="add-margin-top-4x">
-                            <div id="policy-description" class="panel-title-description"></div>
-                        </div>
-                        <br>
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                            Profile Information
+                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                        Policy Overview
+                    </div>
+                    {{#defineZone "policy-detail-properties"}}
+                        <table class="table table-responsive table-striped" id="members">
+                            <tbody>
+                            <tr role="row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
+                                <td id="policy-platform" style="padding:10px 15px;"></td>
+                            </tr>
+                            <tr role="row" class="odd">
+                                <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
+                                <td id="policy-assignment" style="padding:10px 15px;"></td>
+                            </tr>
+                            <tr role="row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
+                                <td id="policy-action" style="padding:10px 15px;"></td>
+                            </tr>
+                            <tr role="row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px;">Status</td>
+                                <td id="policy-status" style="padding:10px 15px;"></td>
+                            </tr>
+                            <tr role="row" id="users-row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
+                                <td id="policy-users" style="padding:10px 15px;"></td>
+                            </tr>
+                            <tr role="row" id="roles-row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
+                                <td id="policy-roles" style="padding:10px 15px;"></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    {{/defineZone}}
+                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
+                    </div>
+                    <div class="add-margin-top-4x">
+                        <div id="policy-description" class="panel-title-description"></div>
+                    </div>
+                    <br>
+                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                        Profile Information
+                    </div>
+                    <div class="add-margin-top-4x">
+                        <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
+                            <i class="icon fw fw-error"></i><span></span>
                         </div>
-                        <div class="add-margin-top-4x">
-                            <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
-                                <i class="icon fw fw-error"></i><span></span>
-                            </div>
-                            <div class="wr-advance-operations">
-                                <div class="wr-advance-operations-init">
-                                    <br>
-                                    <i class="fw fw-settings fw-spin fw-2x"></i>
-                                    Loading platform features . . .
-                                    <br>
-                                    <br>
-                                </div>
+                        <div class="wr-advance-operations">
+                            <div class="wr-advance-operations-init">
+                                <br>
+                                <i class="fw fw-settings fw-spin fw-2x"></i>
+                                Loading platform features . . .
+                                <br>
+                                <br>
                             </div>
                         </div>
                     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 90ed8a2d2f..1a89379d3f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -3522,7 +3522,7 @@ a.btn-operations {
     font-size: 13px;
     color: #fff;
     background: #11375B;
-    padding: 10px 24px;
+    padding: 5px 20px;
     display: inline-block;
     margin-right: 2px;
     text-decoration: none;
@@ -4615,7 +4615,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-hidden-operations-content .panel-body {
-    padding: 5px 20px 20px;
+    padding: 0px 20px 20px;
     background: #ffffff;
 }
 .wr-hidden-operations-content .panel-body hr{