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 75e22de543..42924f980d 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
@@ -23,7 +23,7 @@
     {{#if deviceFound}}
         {{#if isAuthorized}}
             <div class="row">
-              <div class="col-lg-4">
+              <div class="col-lg-5">
                   <div class="device-info-container">
                       <div class="row">
                           <div class="col-lg-3">
@@ -68,8 +68,8 @@
                   {{/defineZone}}
                   <div class="clearfix"></div>
               </div>
-              <!-- /col-lg-4 -->
-              <div class="col-lg-8">
+              <!-- /col-lg-5 -->
+              <div class="col-lg-7">
                   <ul class="nav nav-tabs">
                     {{#defineZone "device-view-tabs"}}
                       <li class="active"><a data-toggle="tab" href="#event_log">Operations Log</a></li>
@@ -118,7 +118,7 @@
                     {{/defineZone}}
                   </div>
               </div>
-              <!-- /col-lg-08 -->
+              <!-- /col-lg-7 -->
             </div>
             <!-- /row -->
         {{else}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
index a220a923a1..8ed9f3dce8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
@@ -7472,7 +7472,6 @@ ul.sidebar-messages > li {
  * ======================================================================== */
 .body-wrapper {
   padding: 40px;
-  margin-bottom:40px;
 }
 
 .body-wrapper a.btn:hover,.body-wrapper a:hover {