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/public/js/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
new file mode 100644
index 0000000000..fe5ac86b97
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+$(document).ready(function () {
+ $('#cloud-menu-popover i.fw-tiles').popover({
+ html: true,
+ trigger:'click',
+ title: function() {
+ return $("#popover-head").html();
+ },
+ content: function() {
+ return $("#popover-content").html();
+ }
+ });
+});
\ No newline at end of file
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 28f1e68b7c..d9390e99b7 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
@@ -82,7 +82,7 @@
Configure
-
+
\ No newline at end of file
+
+
+
+
+
+{{#zone "bottomJs"}}
+ {{js "/js/user-menu.js"}}
+{{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
index 070ed3088a..dd60f631f0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
@@ -15,5 +15,11 @@
specific language governing permissions and limitations
under the License.
}}
-{{#zone "productName"}}WSO2 IoT Server{{/zone}}
-{{#zone "productNameResponsive"}}WSO2 IoT Server{{/zone}}
\ No newline at end of file
+
+{{#if isCloud}}
+ {{#zone "productName"}}WSO2 Cloud{{/zone}}
+ {{#zone "productNameResponsive"}}WSO2 Cloud{{/zone}}
+{{else}}
+ {{#zone "productName"}}WSO2 IoT Server{{/zone}}
+ {{#zone "productNameResponsive"}}WSO2 IoT Server{{/zone}}
+{{/if}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.js
new file mode 100644
index 0000000000..e63ad073c3
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function onRequest(context) {
+ var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+ var viewModal = {};
+ viewModal.isCloud = mdmProps["isCloud"];
+ return viewModal;
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
index a0e5807636..1088a70f6e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
@@ -109,3 +109,126 @@
header .brand h1 {
text-transform: none !important;
}
+
+.visible-inline-block {
+ display: inline-block !important;
+}
+
+.cloud-menu .popover {
+ border-radius: 0px;
+ width: 24em;
+ left: -21.1em !important;
+ max-width: 32em;
+ background-color: #006690
+}
+.cloud-menu .popover-title,.navbar-header .popover-title {
+ background-color: #006690;
+ font-size: 16px;
+ border-bottom: none;
+ font-weight: 400;
+}
+.cloud-menu .popover.bottom>.arrow{
+ margin-left:-2px;
+}
+.cloud-menu .popover.bottom>.arrow:after,.navbar-header .popover.bottom>.arrow:after{
+ border-bottom-color: #006690;
+}
+.cloud-block {
+ float: left;
+ width: 8.2em;
+ height: 8.2em;
+ background-color: #fff;
+ margin: 0.5em 0em 0.5em 0.5em;
+ text-align: center;
+ vertical-align: middle;
+}
+.cloud-name {
+ font-size:14px;
+ margin-top: .5em;
+ font-weight: 400;
+}
+.cloud-menu-popover {
+ position: relative;
+ float: right;
+ padding: 0px 8px;
+ background-color: transparent;
+ background-image: none;
+ border: 1px solid transparent;
+ border-radius: 4px;
+ color: #fff;
+ cursor: pointer;
+}
+#cloud-menu-popover-xs {
+ color: #fff;
+ line-height:24px;
+ border: none;
+ margin-right: 15px!important;
+}
+.navbar-toggle{
+ border:none;
+ border-radius: 0px;
+}
+.navbar-header .popover {
+ border-radius: 0px;
+ width: 21em;
+ max-width:32em;
+ background-color: #006690;
+}
+.navbar-header .popover .popover-content{
+ padding:0px;
+}
+.cloud-menu .popover-content {
+ padding: 0px;
+}
+.cloud-actions {
+ background-color: #005578;
+ float: left;
+ position: absolute;
+ width: 100%;
+ left: 0px;
+ overflow:hidden;
+}
+.cloud-actions h3 {
+ font-size: 16px;
+ font-weight: 400;
+ padding-left: 14px;
+ margin-top: 10px;
+}
+.cloud-block-invert {
+ color: #fff;
+ float: left;
+ width: 8.2em;
+ height: 8.2em;
+ background-color: #1f1f1f;
+ margin: 0.5em 0em 0.5em 0.5em;
+ text-align: center;
+ cursor: pointer;
+}
+
+.cloud-block-default {
+ color: #006690;
+ background-color: #fff;
+ cursor: pointer;
+}
+.cloud-actions a:hover {
+ color: #d7d5d5;
+ background-color: #3d3d3d;
+ text-decoration: none
+}
+.cloud-apps a {
+ text-decoration: none;
+ color: #006690;
+ cursor: pointer
+}
+.cloud-apps a:hover {
+ text-decoration: none;
+ color: #006690;
+ background-color: #c5c5c5;
+}
+.cloud-apps .cloud-actions a {
+ color: #fff
+}
+
+.add-padding-top-3x {
+ padding-top: 15px !important;
+}
\ No newline at end of file