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 83b6f72333..3579228ec4 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
@@ -16,53 +16,43 @@
   under the License.
 }}
 
-{{#zone "contentTitle"}}
-    <div class="row wr-device-board">
-        <div class="col-lg-12 wr-secondary-bar">
-            <label class="device-id device-select"
-                   data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
-                   data-appcontext="{{@app.context}}">
-                Device {{device.name}}
-                {{#if device.viewModel.vendor}}
-                    <span class="lbl-device">
-                                    ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
-                                </span>
-                {{/if}}
-            </label>
-        </div>
-    </div>
-{{/zone}}
-
 {{#zone "content"}}
-<div class="row no-gutter add-padding-5x add-margin-top-5x"
-     style="border: 1px solid #e4e4e4;">
-    <div class="media">
-        <div id="device_overview">
-            <div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
-                <div class="thumbnail icon">
-                    {{#defineZone "device-thumbnail"}}
-                        <i class="square-element text fw fw-mobile"></i>
-                    {{/defineZone}}
+    <h1 class="page-sub-title device-id device-select" data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}">
+        Device {{device.name}}
+        {{#if device.viewModel.model}}
+            <span class="lbl-device">
+                ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
+            </span>
+        {{/if}}
+    </h1>
+    <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
+        <div class="media">
+            <div id="device_overview">
+                <div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
+                    <div class="thumbnail icon">
+                        {{#defineZone "device-thumbnail"}}
+                            <i class="square-element text fw fw-mobile"></i>
+                        {{/defineZone}}
+                    </div>
                 </div>
-            </div>
-            <div class="media-body asset-desc add-padding-left-5x">
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                    Device Overview - {{label}}</div>
-                {{unit "cdmf.unit.device.overview-section" device=device}}
-                {{#defineZone "operation-status"}}{{/defineZone}}
-                {{#defineZone "device-opetations"}}
+                <div class="media-body asset-desc add-padding-left-5x">
                     <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                        Operations
-                    </div>
-                    <div class="add-margin-top-4x" style="height: 90px;">
-                        {{unit "cdmf.unit.device.operation-bar" device=device}}
-                    </div>
-                {{/defineZone}}
+                        Device Overview - {{label}}</div>
+                    {{unit "cdmf.unit.device.overview-section" device=device}}
+                    {{#defineZone "operation-status"}}{{/defineZone}}
+                    {{#defineZone "device-opetations"}}
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                            Operations
+                        </div>
+                        <div class="add-margin-top-4x" style="height: 90px;">
+                            {{unit "cdmf.unit.device.operation-bar" device=device}}
+                        </div>
+                    {{/defineZone}}
+                </div>
             </div>
         </div>
-    </div>
 
-    {{#defineZone "device-detail-properties"}}
+        {{#defineZone "device-detail-properties"}}
         <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">
@@ -194,7 +184,7 @@
             </div>
         </div>
     {{/defineZone}}
-</div>
+    </div>
 {{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/device-view.js"}}