diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
index 2c13e661f92..4ce5f300d4b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
@@ -19,6 +19,9 @@
     <a href="{{#defineZone "productUri"}}{{@app.context}}/{{/defineZone}}">
         <img src="{{@unit.publicUri}}/img/logo.png" alt="{{defineZone "productName"}}"
              title="{{defineZone "productName"}}" class="logo" />
-        <h1>{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}</h1>
+        <h1>
+            <span class="hidden-xs">{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}</span>

+            <span class="visible-xs-inline">{{#defineZone "productNameResponsive"}}UUI Tmpl. App{{/defineZone}}</span>
+        </h1>
     </a>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
index f18ad409db1..d14d5dfed6b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
@@ -27,12 +27,7 @@
                     {{@user.username}}<span class="caret"></span>
                 </span>
             </a>
-            <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
-                role="menu">
-                <li class="dropdown-header visible-xs">
-                    {{@user.username}}<span class="caret"></span>
-                </li>
-                <li class="divider visible-xs"></li>
+            <ul class="dropdown-menu dropdown-menu-right slideInDown" role="menu">
                 {{#defineZone "userMenu-items"}}
                     <li>
                         <a href="{{@app.context}}/signout">Sign Out</a>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs
index 573052fa115..fe6c030d275 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs
@@ -18,10 +18,10 @@
 {{#zone "header"}}
     <header class="header header-default">
         <div class="container-fluid">
-            <div class="pull-left brand float-remove-xs text-center-xs">
+            <div class="pull-left brand">
                 {{defineZone "brand"}}
             </div>
-            <div class="pull-right auth float-remove-xs text-center-xs">
+            <div class="pull-right auth">
                 {{defineZone "userMenu"}}
             </div>
         </div>
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 a7264020b96..7e81de65e04 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
@@ -2791,6 +2791,7 @@ header .brand {
 }
 header .brand img.logo {
   height: 24px;
+  margin-top:0px;
 }
 header .brand a {
   display: inline-block;
@@ -2822,6 +2823,9 @@ header .nav .open > a:focus {
 }
 header .nav .dropdown-menu {
   background: black;
+  padding:0px;
+  margin:0px;
+  top:50px;
 }
 header .nav .dropdown-menu a {
   color: #fff;
@@ -2954,7 +2958,7 @@ tbody.collapse.in {
 }
 .dropdown-menu > li > a {
   display: block;
-  padding: 3px 20px;
+  padding: 8px 20px;
   clear: both;
   font-weight: normal;
   line-height: 1.42857;
@@ -3050,6 +3054,12 @@ tbody.collapse.in {
     right: auto;
   }
 }
+@media (max-width : 480px) {
+    .navbar-right .dropdown-menu-right {
+        left: auto;
+        right: 0;
+    }
+}
 .btn-group,
 .btn-group-vertical {
   position: relative;