diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css
index 941b52a795..7ce9fda525 100644
--- a/frappe/public/css/sidebar.css
+++ b/frappe/public/css/sidebar.css
@@ -38,6 +38,7 @@ body[data-route^="Module"] .main-menu .form-sidebar {
 }
 .offcanvas .sidebar .badge {
   right: 15px !important;
+  top: 11px !important;
 }
 .offcanvas .sidebar .sidebar-menu > li > a:hover,
 .offcanvas .sidebar .sidebar-menu > li > a:focus,
@@ -70,6 +71,7 @@ body[data-route^="Module"] .main-menu .form-sidebar {
   position: absolute;
   font-weight: normal;
   right: 0px;
+  top: 0px;
   padding-bottom: 4px;
 }
 .sidebar-menu .octicon {
diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 673d5b5199..2f732bcde1 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -62,7 +62,7 @@ frappe.dom = {
 	freeze: function() {
 		// blur
 		if(!$('#freeze').length) {
-			$("<div id='freeze' class='modal-backdrop' style='display: none;'>")
+			$("<div id='freeze' class='modal-backdrop fade' style='display: none;'>")
 				.on("click", function() {
 					if (cur_frm && cur_frm.cur_grid) {
 						cur_frm.cur_grid.toggle_view();
@@ -71,14 +71,14 @@ frappe.dom = {
 				})
 				.appendTo("#body_div");
 		}
-		$('#freeze').fadeIn();
+		$('#freeze').toggle(true).addClass("in");
 		frappe.dom.freeze_count++;
 	},
-	unfreeze: function() {
+	unfreeze: function(fade) {
 		if(!frappe.dom.freeze_count)return; // anything open?
 		frappe.dom.freeze_count--;
 		if(!frappe.dom.freeze_count) {
-			$('#freeze').fadeOut();
+			$('#freeze').removeClass("in").toggle(false);
 		}
 	},
 	save_selection: function() {
diff --git a/frappe/public/js/frappe/form/form_sidebar.html b/frappe/public/js/frappe/form/form_sidebar.html
index 889dda7738..346c592075 100644
--- a/frappe/public/js/frappe/form/form_sidebar.html
+++ b/frappe/public/js/frappe/form/form_sidebar.html
@@ -3,7 +3,12 @@
 </ul>
 <ul class="list-unstyled sidebar-menu">
 	<li class="divider"></li>
-	<li><a class="strong sidebar-comments badge-hover">{%= __("Comments") %} <span class="pull-right badge n-comments">0</span></a></li>
+	<li style="position: relative;">
+		<a class="strong sidebar-comments badge-hover">
+			<span>{%= __("Comments") %}</span>
+			<span class="badge n-comments">0</span>
+		</a>
+	</li>
 </ul>
 <ul class="list-unstyled sidebar-menu form-assignments">
 	<li class="divider"></li>
diff --git a/frappe/public/js/frappe/ui/modal.html b/frappe/public/js/frappe/ui/modal.html
index 5b74003208..669f5615ae 100644
--- a/frappe/public/js/frappe/ui/modal.html
+++ b/frappe/public/js/frappe/ui/modal.html
@@ -1,4 +1,4 @@
-<div class="modal" style="overflow: auto;" tabindex="-1">
+<div class="modal fade" style="overflow: auto;" tabindex="-1">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js
index a7de386fae..a6f5349df0 100644
--- a/frappe/public/js/frappe/ui/tags.js
+++ b/frappe/public/js/frappe/ui/tags.js
@@ -17,7 +17,7 @@ frappe.ui.TagEditor = Class.extend({
 		this.$tags = $('<ul>').prependTo(this.$w).tagit({
 			animate: false,
 			allowSpaces: true,
-			placeholderText: __('Type to tag' + "..."),
+			placeholderText: __('Add a tag' + "..."),
 			onTagAdded: function(ev, tag) {
 				if(me.initialized && !me.refreshing) {
 					var tag = tag.find('.tagit-label').text();
diff --git a/frappe/public/js/frappe/views/container.js b/frappe/public/js/frappe/views/container.js
index 4e7cf0bc78..21f6abe823 100644
--- a/frappe/public/js/frappe/views/container.js
+++ b/frappe/public/js/frappe/views/container.js
@@ -19,6 +19,10 @@ frappe.views.Container = Class.extend({
 			// set data-route in body
 			$("body").attr("data-route", frappe.get_route_str());
 		});
+
+		$(document).bind('rename', function(event, dt, old_name, new_name) {
+			me.rename_breadcrumbs(dt, old_name, new_name)
+		});
 	},
 	add_page: function(label) {
 		var page = $('<div class="content page-container"></div>')
@@ -100,6 +104,12 @@ frappe.views.Container = Class.extend({
 				{doctype: breadcrumbs.doctype, label: __(breadcrumbs.doctype)}))
 				.appendTo($breadcrumbs);
 		}
+	},
+	rename_breadcrumbs: function(doctype, old_name, new_name) {
+		var old_route_str = frappe.get_route_str(["Form", doctype, old_name]);
+		var new_route_str = frappe.get_route_str(["Form", doctype, new_name]);
+		frappe.breadcrumbs[new_route_str] = frappe.breadcrumbs[old_route_str];
+		delete frappe.breadcrumbs[old_route_str];
 	}
 });
 
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index bf875c87f3..06eb22eac1 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -53,6 +53,7 @@ body[data-route^="Module"] .main-menu {
 
 	.badge {
 		right: 15px !important;
+		top: 11px !important;
 	}
 }
 
@@ -96,6 +97,7 @@ body[data-route^="Module"] .main-menu {
 		position: absolute;
 		font-weight: normal;
 		right: 0px;
+		top: 0px;
 		padding-bottom: 4px;
 	}