diff --git a/frappe/public/build.json b/frappe/public/build.json
index 9c395c9bca..f133e4742b 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -381,7 +381,9 @@
 		"public/less/list.less",
 		"website/css/web_form.css",
 		"public/less/quill.less",
-		"public/less/datepicker.less"
+		"public/less/datepicker.less",
+		"public/less/awesomplete.less",
+		"public/less/form_grid.less"
 	],
 	"js/print_format_v3.min.js": [
 		"public/js/legacy/layout.js",
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 3255b0fb4a..6dc18e9bd1 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -59,30 +59,30 @@ export default class Grid {
 				<div class="grid-body">
 					<div class="rows"></div>
 					<div class="grid-empty text-center hide">${__("No Data")}</div>
-					<div class="small form-clickable-section grid-footer">
-						<div class="row">
-							<div class="col-sm-6 grid-buttons">
-								<button type="reset"
-									class="btn btn-xs btn-danger grid-remove-rows hide"
-									style="margin-right: 4px;">
-									${__("Delete")}</button>
-								<button type="reset"
-									class="grid-add-multiple-rows btn btn-xs btn-default hide"
-									style="margin-right: 4px;">
-									${__("Add Multiple")}</a>
-								<!-- hack to allow firefox include this in tabs -->
-								<button type="reset" class="btn btn-xs btn-default grid-add-row">
-									${__("Add Row")}</button>
-							</div>
-							<div class="col-sm-6 text-right">
-								<a href="#" class="grid-download btn btn-xs btn-default hide"
-									style="margin-left: 10px;">
-									${__("Download")}</a>
-								<a href="#" class="grid-upload btn btn-xs btn-default hide"
-									style="margin-left: 10px;">
-									${__("Upload")}</a>
-							</div>
-						</div>
+				</div>
+			</div>
+			<div class="mt-2 small form-clickable-section grid-footer">
+				<div class="row">
+					<div class="col-sm-6 grid-buttons">
+						<button type="reset"
+							class="btn btn-xs btn-danger grid-remove-rows hide"
+							style="margin-right: 4px;">
+							${__("Delete")}</button>
+						<button type="reset"
+							class="grid-add-multiple-rows btn btn-xs btn-default hide"
+							style="margin-right: 4px;">
+							${__("Add Multiple")}</a>
+						<!-- hack to allow firefox include this in tabs -->
+						<button type="reset" class="btn btn-xs btn-default grid-add-row">
+							${__("Add Row")}</button>
+					</div>
+					<div class="col-sm-6 text-right">
+						<a href="#" class="grid-download btn btn-xs btn-default hide"
+							style="margin-left: 10px;">
+							${__("Download")}</a>
+						<a href="#" class="grid-upload btn btn-xs btn-default hide"
+							style="margin-left: 10px;">
+							${__("Upload")}</a>
 					</div>
 				</div>
 			</div>
@@ -369,7 +369,7 @@ export default class Grid {
 		return data;
 	}
 	get_modal_data() {
-		return this.df.get_data ? this.df.get_data().filter(data => {
+		return this.df.get_data() ? this.df.get_data().filter(data => {
 			if (!this.deleted_docs || !in_list(this.deleted_docs, data.name)) {
 				return data;
 			}
diff --git a/frappe/public/less/awesomplete.less b/frappe/public/less/awesomplete.less
index 1642e3171d..3a676f60d3 100644
--- a/frappe/public/less/awesomplete.less
+++ b/frappe/public/less/awesomplete.less
@@ -1,3 +1,4 @@
+@import "variables.less";
 .awesomplete {
 
 	display: inline-block;
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index abf4f228aa..d2b5679198 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -3,7 +3,7 @@
 {% block title %}{{ _(title) }}{% endblock %}
 
 {% block header %}
-<h1>{{ _(title) }}</h1>
+<h2>{{ _(title) }}</h2>
 {% endblock %}
 
 
@@ -27,11 +27,11 @@
 	</div>
 	{% endif %}
 	{% if is_list %}
-	<div style="padding-bottom: 15px;">
-	    <a href="/{{ pathname }}{{ delimeter }}new=1{{ params_from_form_dict}}" class="btn btn-primary btn-new btn-sm">
+	<div class="text-right mt-2">
+	    <a href="/{{ pathname }}{{ delimeter }}new=1{{ params_from_form_dict}}" class="btn btn-primary btn-new">
 	    {{ _("New") }}
 		</a>
-		<button class="btn btn-danger btn-delete btn-sm">
+		<button class="btn btn-danger btn-delete">
 			{{ _("Delete") }}
 		</button>
 	</div>
@@ -46,12 +46,14 @@
 {% endblock %}
 
 {% block page_content %}
-<div class="introduction">
-	{% if introduction_text %}
-	<p class="text-muted">{{ _(introduction_text) }}</p>
-	{% endif %}
-</div>
-<div class="form-message hidden"></div>
+{% if introduction_text %}
+	<div class="introduction">
+		<p class="text-muted">{{ _(introduction_text) }}</p>
+	</div>
+{% else %}
+	<hr style="margin-top: 0;">
+{% endif %}
+<div class="form-message hide"></div>
 
 {% if _login_required %}
 <div class="login-required">
diff --git a/frappe/website/js/grid_list.js b/frappe/website/js/grid_list.js
index 5c8e3c363c..222bd2c8da 100644
--- a/frappe/website/js/grid_list.js
+++ b/frappe/website/js/grid_list.js
@@ -51,7 +51,7 @@ export default function make_datatable(container, doctype) {
 				.css({cursor: 'pointer'})
 				.click((e) => {
 					if ($(e.target).is('[type=checkbox]')) return
-					window.location.href = window.location.href + '?name=' + data[i].name;
+					window.location.href = window.location.origin + window.location.pathname + '?name=' + data[i].name;
 				});
 			for (let fieldname of colnames) {
 				let val = data[i][fieldname];
@@ -116,14 +116,13 @@ export default function make_datatable(container, doctype) {
 			args: { doctype },
 			callback: (r) => {
 				const docfields = r.message;
-
+				var data = frappe.utils.get_query_params();
+				data.doctype = doctype;
+				data.fields = docfields.map(df => df.fieldname);
+				data.web_form_name = window.web_form_settings.web_form_name;
 				frappe.call({
 					method: 'frappe.www.list.get_list_data',
-					args: {
-						doctype,
-						fields: docfields.map(df => df.fieldname),
-						web_form_name: window.web_form_settings.web_form_name
-					},
+					args: data,
 					callback: (r) => {
 						const data = r.message || [];
 						make_table(docfields, data);
diff --git a/frappe/www/list.py b/frappe/www/list.py
index e0d8bd895a..416a2446ce 100644
--- a/frappe/www/list.py
+++ b/frappe/www/list.py
@@ -70,7 +70,7 @@ def get(doctype, txt=None, limit_start=0, limit=20, pathname=None, **kwargs):
 	}
 
 @frappe.whitelist(allow_guest=True)
-def get_list_data(doctype, txt=None, limit_start=0, limit=20, **kwargs):
+def get_list_data(doctype, txt=None, limit_start=0, fields=None, cmd=None, limit=20, **kwargs):
 	"""Returns processed HTML page for a standard listing."""
 	limit_start = cint(limit_start)