diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 36e123707a..8be8a07f03 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -386,6 +386,9 @@ textarea.form-control {
   padding: 7px;
   font-size: 12px;
 }
+.ui-menu .ui-menu-item a {
+  text-decoration: none;
+}
 @media (min-width: 768px) {
   .video-modal {
     width: 700px;
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 2f894e71c1..775e694507 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -200,6 +200,9 @@ textarea.form-control {
 .ui-menu .ui-menu-item {
 	padding: 7px;
 	font-size: @text-medium;
+	a {
+		text-decoration: none;
+	}
 }
 
 
diff --git a/frappe/templates/includes/list/list.js b/frappe/templates/includes/list/list.js
index 40ed20bffa..f9758e43bf 100644
--- a/frappe/templates/includes/list/list.js
+++ b/frappe/templates/includes/list/list.js
@@ -38,7 +38,7 @@ frappe.ready(function() {
 		}
 	};
 	
-	if($('.web-sidebar:visible').length === 0)
+	if($('.navbar-header .navbar-toggle:visible').length === 1)
 	{
 		$('.page-head h1').addClass('list-head').click(function(){
 			window.history.back();
diff --git a/frappe/templates/includes/navbar/dropdown_items.html b/frappe/templates/includes/navbar/dropdown_items.html
new file mode 100644
index 0000000000..4d7e54c829
--- /dev/null
+++ b/frappe/templates/includes/navbar/dropdown_items.html
@@ -0,0 +1,17 @@
+<ul class="dropdown-menu dropdown-menu-right">
+{% if top_bar_items -%}
+	{%- for page in top_bar_items -%}
+		{% if not page.parent_label and not page.right -%}
+			{% include "templates/includes/navbar/navbar_link.html" %}
+		{%- endif -%}
+	{%- endfor %}
+{%- endif %}
+{%- for page in top_bar_items -%}
+	{% if not page.parent_label and page.right -%}
+		{% include "templates/includes/navbar/navbar_link.html" %}
+	{%- endif -%}
+{%- endfor %}
+{% block navbar_right_extension %}{% endblock %}
+<li class="divider"></li>
+{% include "templates/includes/navbar/dropdown_login.html" %}
+</ul>
diff --git a/frappe/templates/includes/navbar/dropdown_login.html b/frappe/templates/includes/navbar/dropdown_login.html
new file mode 100644
index 0000000000..9bd687a106
--- /dev/null
+++ b/frappe/templates/includes/navbar/dropdown_login.html
@@ -0,0 +1,17 @@
+<!-- post login tools -->
+{% if not only_static %}
+{%- for child in post_login -%}
+<li {% if child.label %}data-label="{{ child.label }}" {% endif %}
+ class="{% if child.class %} {{ child.class }} {% endif %} logged-in" >
+	{%- if child.url -%}
+	<a href="{{ child.url | abs_url }}" {{ child.target or '' }}
+	rel="nofollow">
+	{{ child.label }}
+	</a>
+	{%- endif -%}
+	</li>
+{%- endfor -%}
+{% if not hide_login %}
+<li class="btn-login-area"><a href="/login">{{ _("Login") }}</a></li>
+{% endif %}
+{% endif %}
diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html
index fbb164f9f7..5292c1fc84 100644
--- a/frappe/templates/includes/navbar/navbar.html
+++ b/frappe/templates/includes/navbar/navbar.html
@@ -4,12 +4,18 @@
 			<div class="navbar-header">
 				<!-- <a class="navbar-brand ellipsis" href="{{ url_prefix }}{{ home_page or "/" }}"> -->
 				<a class="navbar-brand ellipsis"
-					 href="{{ url_prefix }}{% if frappe.user=="Guest" %} {{ home_page or "/"}} {% else %} /me {% endif %}">
+					 href="{{ url_prefix }}{{ home_page or "/"}}">
 					<span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span>
 				</a>
-				<a class="pull-right visible-xs navbar-toggle toggle-sidebar">
+				<!-- <a class="pull-right visible-xs navbar-toggle toggle-sidebar">
 					<i class="octicon octicon-three-bars"></i>
-				</a>
+				</a> -->
+				<div class="dropdown">
+					<button class="btn btn-default navbar-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+						<i class="octicon octicon-three-bars"></i>
+					</button>
+					{% include "templates/includes/navbar/dropdown_items.html" %}
+				</div>
 			</div>
 			<div class="hidden-xs">
 				{% block navbar_items %}
diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html
index b2d7be9652..77d0525640 100644
--- a/frappe/templates/includes/navbar/navbar_items.html
+++ b/frappe/templates/includes/navbar/navbar_items.html
@@ -1,17 +1,17 @@
 {% if top_bar_items -%}
 <ul class="nav navbar-nav navbar-left">
 	{%- for page in top_bar_items -%}
-	{% if not page.parent_label and not page.right -%}
-	{% include "templates/includes/navbar/navbar_link.html" %}
-	{%- endif -%}
+		{% if not page.parent_label and not page.right -%}
+			{% include "templates/includes/navbar/navbar_link.html" %}
+		{%- endif -%}
 	{%- endfor %}
 </ul>
 {%- endif %}
 <ul class="nav navbar-nav navbar-right">
 	{%- for page in top_bar_items -%}
-	{% if not page.parent_label and page.right -%}
-	{% include "templates/includes/navbar/navbar_link.html" %}
-	{%- endif -%}
+		{% if not page.parent_label and page.right -%}
+			{% include "templates/includes/navbar/navbar_link.html" %}
+		{%- endif -%}
 	{%- endfor %}
 	{% block navbar_right_extension %}{% endblock %}
 	{% include "templates/includes/navbar/navbar_login.html" %}
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 0b67c9b025..bfe9e18255 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -75,7 +75,7 @@ def get_website_settings():
 		'footer_items': get_items('footer_items'),
 		"post_login": [
 			{"label": "My Account", "url": "/me"},
-			{"class": "divider"},
+#			{"class": "divider"},
 			{"label": "Logout", "url": "/?cmd=web_logout"}
 		]
 	})
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index bc453d4d69..2556ea42e6 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -371,6 +371,7 @@ $(document).ready(function() {
 	window.logged_in = getCookie("sid") && getCookie("sid")!=="Guest";
 	$("#website-login").toggleClass("hide", logged_in ? true : false);
 	$("#website-post-login").toggleClass("hide", logged_in ? false : true);
+	$(".logged-in").toggleClass("hide", logged_in ? false : true);
 
 	frappe.bind_navbar_search();
 
@@ -390,8 +391,9 @@ $(document).ready(function() {
 	});
 
 	// switch to app link
-	if(getCookie("system_user")==="yes") {
+	if(getCookie("system_user")==="yes" && logged_in) {
 		$("#website-post-login .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
+		$(".navbar-header .dropdown .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
 	}
 
 	frappe.render_user();