diff --git a/css/legacy/body.css b/css/legacy/body.css
index 1b755f3014..44636036ef 100644
--- a/css/legacy/body.css
+++ b/css/legacy/body.css
@@ -203,9 +203,9 @@ div.std-footer-item {
 }
 
 .layout_wrapper, .layout-wrapper {
-	-moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
-	-webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
-	box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
+	-webkit-box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
+	box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
 	background-color: #fff;
 	padding: 15px;
 	-webkit-border-radius: 5px;
@@ -225,7 +225,8 @@ div.std-footer-item {
 }
 
 .layout-main {
-	padding: 15px;	
+	padding: 15px;
+	background-color: #fff;
 }
 
 .layout-main-section {
diff --git a/js/core.min.js b/js/core.min.js
index 0e0168ad32..f6c8bc3da0 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -216,7 +216,7 @@ if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.field
 /*
  *	lib/js/wn/views/container.js
  */
-wn.provide('wn.pages');wn.provide('wn.views');wn.views.Container=Class.extend({init:function(){this.container=$('#body_div').get(0);this.page=null;this.pagewidth=$('#body_div').width();this.pagemargin=50;},add_page:function(label,onshow,onhide){var page=$('<div class="content"></div>').appendTo(this.container).get(0);if(onshow)
+wn.provide('wn.pages');wn.provide('wn.views');wn.views.Container=Class.extend({init:function(){this.container=$('#body_div').get(0);this.page=null;this.pagewidth=$('#body_div').width();this.pagemargin=50;},add_page:function(label,onshow,onhide){var page=$('<div class="content"></div>').attr('id',"page-"+label).appendTo(this.container).get(0);if(onshow)
 $(page).bind('show',onshow);if(onshow)
 $(page).bind('hide',onhide);page.label=label;wn.pages[label]=page;return page;},change_to:function(label){if(this.page&&this.page.label==label){return;}
 var me=this;if(label.tagName){var page=label;}else{var page=wn.pages[label];}
diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js
index ab6fda2ab3..a59328e767 100644
--- a/js/legacy/widgets/form/form.js
+++ b/js/legacy/widgets/form/form.js
@@ -244,7 +244,9 @@ _f.Frm.prototype.rename_notify = function(dt, old, name) {
 
 	// from form
 	if(this.docname == old)
-		this.docname = name;	
+		this.docname = name;
+	else
+		return; // thats it, not for children!
 
 	// cleanup
 	if(this && this.opendocs[old]) {
diff --git a/js/wn/views/container.js b/js/wn/views/container.js
index 3ae7d5f2c4..99c0bb94ef 100644
--- a/js/wn/views/container.js
+++ b/js/wn/views/container.js
@@ -11,6 +11,7 @@ wn.views.Container = Class.extend({
 	},
 	add_page: function(label, onshow, onhide) {
 		var page = $('<div class="content"></div>')
+			.attr('id', "page-" + label)
 			.appendTo(this.container).get(0);
 		if(onshow)
 			$(page).bind('show', onshow);
diff --git a/py/core/page/login_page/login_page.js b/py/core/page/login_page/login_page.js
index a14ce45590..293f657342 100644
--- a/py/core/page/login_page/login_page.js
+++ b/py/core/page/login_page/login_page.js
@@ -23,6 +23,7 @@
 pscript['onload_Login Page'] = function(wrapper){
 	wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
 	wrapper.appframe.title('Login');
+	wrapper.appframe.$w.find('.close').toggle(false);
 
 	var lw = $i('login_wrapper');
 	$bs(lw, '1px 1px 3px #888');
diff --git a/py/webnotes/model/doctype.py b/py/webnotes/model/doctype.py
index 2d095e165b..cbeaf701d0 100644
--- a/py/webnotes/model/doctype.py
+++ b/py/webnotes/model/doctype.py
@@ -49,11 +49,12 @@ class _DocType:
 		doclist += self.get_custom_fields(self.name)
 
 		if form:
-			table_fields = self.get_table_fields(doclist)
-			for t in table_fields:
+			table_fields = [t[0] for t in self.get_table_fields(doclist)]
+			# for each unique table
+			for t in list(set(table_fields)):
 				# Get child doc and its fields
-				table_doclist = webnotes.model.doc.get('DocType', t[0], 1)
-				table_doclist += self.get_custom_fields(t[0])
+				table_doclist = webnotes.model.doc.get('DocType', t, 1)
+				table_doclist += self.get_custom_fields(t)
 				doclist += table_doclist
 
 		self.apply_property_setters(doclist)
diff --git a/py/webnotes/widgets/page.py b/py/webnotes/widgets/page.py
index 09f0e550d6..899d4e3500 100644
--- a/py/webnotes/widgets/page.py
+++ b/py/webnotes/widgets/page.py
@@ -50,7 +50,6 @@ class Page:
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
 				doc.fields['__script'] = f.read()
-		doc.script = None
 
 		# css
 		fpath = os.path.join(path, scrub(doc.name) + '.css')