diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
index d9390e99b72..68aeacb880a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
@@ -18,10 +18,10 @@
 <ul class="nav navbar-right float-remove-xs text-center-xs">
 
     <li class="visible-inline-block">
-        <a href="#" target="_self" title="kachiex">
-            <span class="icon fw-stack fw-lg">
-                        <i class="fw fw-organization fw-stack-1x" title=" {{@user.domain}}"></i>
-                    </span>
+        <a href="#" target="_self" title="{{@user.domain}}">
+                        <span class="icon fw-stack fw-lg">
+                            <i class="fw fw-organization fw-stack-1x" title=" {{@user.domain}}"></i>
+                        </span>
             <span class="hidden-xs">
                 {{@user.domain}}
             </span>
@@ -75,25 +75,38 @@
 
     <li class="visible-inline-block">
 
-        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="Configure">
+        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="App Management">
                     <span class="icon fw-stack fw-lg">
-                        <i class="fw fw-settings fw-stack-1x" title="Configure"></i>
+                        <i class="fw fw-settings fw-stack-1x" title="App Management"></i>
                     </span>
             <span class="hidden-xs">
-                        Configure
-                    </span>
+                        App Management
+            </span>
             <!--<span class="caret"></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="visible-inline-block">
+                <a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher"
+                   target="_self">
+                    <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
+                </a>
+            </li>
 
+            <li class="visible-inline-block">
+                <a title="App Store " href="https://devicemgt.clouddev.wso2.com/store"
+                   target="_self">
+                    <i class="fw fw-store" title="App Store"></i> App Store
+                </a>
+            </li>
 
         </ul>
     </li>
 
     <li class="visible-inline-block">
-        <a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self" title="Support">
+        <a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self"
+           title="Support">
 
 
                     <span class="icon fw-stack fw-lg" style="color: #ff8c27;">
@@ -122,28 +135,32 @@
             role="menu">
 
             <li>
-                <a title="API Cloud" href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation"
+                <a title="API Cloud"
+                   href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation"
                    target="_blank">
                     <i class="fw fw-api" title="API Cloud"></i> API Cloud
                 </a>
             </li>
 
             <li>
-                <a title="App Cloud" href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation"
+                <a title="App Cloud"
+                   href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation"
                    target="_blank">
                     <i class="fw fw-application" title="App Cloud"></i> App Cloud
                 </a>
             </li>
 
             <li>
-                <a title="App Cloud" href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation"
+                <a title="App Cloud"
+                   href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation"
                    target="_blank">
                     <i class="fw fw-application" title="App Cloud"></i> Device Cloud
                 </a>
             </li>
 
             <li>
-                <a title="API Cloud Walkthrough" href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true"
+                <a title="API Cloud Walkthrough"
+                   href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true"
                    target="_self">
                     <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
                 </a>
@@ -152,21 +169,6 @@
         </ul>
     </li>
 
-
-    <li class="visible-inline-block">
-        <a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher" target="_self">
-            <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
-        </a>
-    </li>
-
-    <li class="visible-inline-block">
-        <a title="App Store " href="https://devicemgt.clouddev.wso2.com/store"
-           target="_self">
-            <i class="fw fw-store" title="App Store"></i> App Store
-        </a>
-    </li>
-
-
     <li class="visible-inline-block">
         <a href="#" class="dropdown" data-toggle="dropdown" title="user">
                     <span class="icon fw-stack fw-lg">
@@ -184,7 +186,8 @@
             role="menu">
 
             <li>
-                <a title="Profile" href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag"
+                <a title="Profile"
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag"
                    target="_self">
                     <i class="fw fw-user" title="Profile"></i> Profile
                 </a>
@@ -192,13 +195,15 @@
 
             <li>
                 <a title="Change Password"
-                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag" target="_self">
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag"
+                   target="_self">
                     <i class="fw fw-lock" title="Change Password"></i> Change Password
                 </a>
             </li>
 
             <li>
-                <a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag" target="_self">
+                <a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag"
+                   target="_self">
                     <i class="fw fw-sign-out" title="Logout"></i> Logout
                 </a>
             </li>
@@ -218,6 +223,7 @@
     </li>
 </ul>
 
+
 <div class="cloud-menu-content hide">
     <div id="popover-head" class="hide">Navigate to Cloud</div>
     <div id="popover-content" class="hide">