diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
index 2b6be8fd6d..1a58360409 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
@@ -19,7 +19,6 @@
 {{unit "cdmf.unit.lib.service-invoker-utility"}}
 {{unit "cdmf.unit.lib.handlebars"}}
 
-{{unit deviceViewUnitName}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -40,6 +39,7 @@
 {{/zone}}
 
 {{#zone "content"}}
+    {{unit deviceViewUnitName}}
     {{unit "cdmf.unit.lib.data-table"}}
     {{unit "cdmf.unit.device.operation-mod"}}
     {{unit "cdmf.unit.device.view"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
index 3663b0c6e9..83b6f72333 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
@@ -15,6 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{#zone "contentTitle"}}
     <div class="row wr-device-board">
         <div class="col-lg-12 wr-secondary-bar">
@@ -32,6 +33,7 @@
     </div>
 {{/zone}}
 
+{{#zone "content"}}
 <div class="row no-gutter add-padding-5x add-margin-top-5x"
      style="border: 1px solid #e4e4e4;">
     <div class="media">
@@ -193,7 +195,7 @@
         </div>
     {{/defineZone}}
 </div>
-
+{{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/device-view.js"}}
     <script id="policy-view" src="{{@unit.publicUri}}/templates/policy-compliance.hbs"
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
index 8397121567..dec7a25f8c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
@@ -50,6 +50,10 @@
     {
       "url": "/api/data-tables/invoker",
       "path": "/api/data-tables-invoker-api.jag"
+    },
+    {
+      "url": "/api/operation/*",
+      "path": "/api/operation-api.jag"
     }
   ]
 }
\ No newline at end of file