diff --git a/css/legacy/default.css b/css/legacy/default.css
index 8f404910a9..f3d37077aa 100644
--- a/css/legacy/default.css
+++ b/css/legacy/default.css
@@ -520,7 +520,7 @@ div.sidebar-comment-info {
 
 .grid_tab_wrapper {
 	position: absolute;
-	top: 30px;
+	top: 40px;
 	border-bottom: 1px solid #DDD;
 }
 
@@ -539,7 +539,7 @@ div.sidebar-comment-info {
 .grid_head_wrapper {
 	position: absolute;
 	z-index: 1;
-	height: 30px;
+	height: 40px;
 	padding: 0px;
 	overflow: hidden;
 	/*background-color: #fff;*/
@@ -549,7 +549,7 @@ div.sidebar-comment-info {
 	background-color: #EEE;
 	border-right: 1px solid #AAA;
 	border-bottom: 1px solid #AAA;
-	height: 30px;
+	height: 40px;
 	padding: 0px;
 }
 
diff --git a/css/legacy/grid.css b/css/legacy/grid.css
index a9c5e877c1..98eeffd6c7 100644
--- a/css/legacy/grid.css
+++ b/css/legacy/grid.css
@@ -45,7 +45,7 @@
 
 .grid_tab_wrapper {
 	position: absolute;
-	top: 30px;
+	top: 40px;
 	border-bottom: 1px solid #DDD;
 }
 
@@ -64,7 +64,7 @@
 .grid_head_wrapper {
 	position: absolute;
 	z-index: 1;
-	height: 30px;
+	height: 40px;
 	padding: 0px;
 	overflow: hidden;
 	/*background-color: #fff;*/
@@ -74,7 +74,7 @@
 	background-color: #EEE;
 	border-right: 1px solid #AAA;
 	border-bottom: 1px solid #AAA;
-	height: 30px;
+	height: 40px;
 	padding: 0px;
 }
 
diff --git a/js/legacy/form.compressed.js b/js/legacy/form.compressed.js
index 01e7845c10..0875e40332 100644
--- a/js/legacy/form.compressed.js
+++ b/js/legacy/form.compressed.js
@@ -305,7 +305,7 @@ this.append_rows(data.length-this.tab.rows.length);if(data.length<this.tab.rows.
 this.truncate_rows(this.tab.rows.length-data.length);for(var ridx=0;ridx<data.length;ridx++){this.refresh_row(ridx,data[ridx]);}
 if(this.can_add_rows&&this.make_newrow){this.make_newrow();}
 this.set_ht();if(this.wrapper.onscroll)this.wrapper.onscroll();}
-_f.Grid.prototype.set_ht=function(ridx,docname){var ht=((cint(this.row_height)+10)*(((this.tab&&this.tab.rows)?this.tab.rows.length:0)+1));if(ht<100)ht=100;if(ht>cint(0.3*screen.width))ht=cint(0.3*screen.width);ht+=4;$y(this.wrapper,{height:ht+'px'});}
+_f.Grid.prototype.set_ht=function(ridx,docname){var ht=$(this.tab).height()+$(this.head_tab).height()+30;console.log(ht);if(ht<100)ht=100;if(ht>cint(0.3*screen.width))ht=cint(0.3*screen.width);ht+=4;$y(this.wrapper,{height:ht+'px'});}
 _f.Grid.prototype.refresh_row=function(ridx,docname){var row=this.tab.rows[ridx];row.docname=docname;row.is_newrow=false;for(var cidx=0;cidx<row.cells.length;cidx++){this.set_cell_value(row.cells[cidx]);}}
 _f.FormGrid=function(field){this.field=field;this.doctype=field.df.options;if(!this.doctype){show_alert('No Options for table '+field.df.label);}
 this.col_break_width=cint(this.field.col_break_width);if(!this.col_break_width)this.col_break_width=100;$y(field.parent,{marginTop:'8px'});this.init(field.parent,field.df.width);this.setup();}
diff --git a/js/legacy/widgets/form/grid.js b/js/legacy/widgets/form/grid.js
index 9d48159601..6f53eddc91 100644
--- a/js/legacy/widgets/form/grid.js
+++ b/js/legacy/widgets/form/grid.js
@@ -431,7 +431,8 @@ _f.Grid.prototype.set_data = function(data) {
 }
 
 _f.Grid.prototype.set_ht = function(ridx, docname) {
-	var ht = ((cint(this.row_height) + 10) * (((this.tab && this.tab.rows) ? this.tab.rows.length : 0) + 1));
+	var ht = $(this.tab).height() + $(this.head_tab).height() + 30;
+	
 	if(ht < 100)ht=100; 
 	if(ht > cint(0.3 * screen.width))ht=cint(0.3 * screen.width);
 	ht += 4;
diff --git a/py/webnotes/db.py b/py/webnotes/db.py
index 211a6202c3..9dc51c487e 100644
--- a/py/webnotes/db.py
+++ b/py/webnotes/db.py
@@ -66,13 +66,9 @@ class Database:
 		      Connect to a database
 		"""
 		self._conn = MySQLdb.connect(user=self.user, host=self.host, passwd=self.password)
-		try:
-			self._conn.set_character_set('utf8')
-		except:
-			pass
+		self._conn.set_character_set('utf8')
 
 		self._cursor = self._conn.cursor()
-		
 		return self._cursor
 	
 	def use(self, db_name):