diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css
index 95e31c07..5336a445 100644
--- a/foundation/public/css/erpnext-org-theme.css
+++ b/foundation/public/css/erpnext-org-theme.css
@@ -1,5 +1,5 @@
-@import "/assets/css/frappe-css.css";
 @import "reset.css";
+@import "/assets/css/frappe-css.css";
 .indicator,
 .indicator-right {
   background: none;
@@ -74,3 +74,6 @@
 .logo-img {
   width: var(--unit-3);
 }
+.page-shadow {
+  box-shadow: 0 0 30px -5px var(--light-grey);
+}
diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less
index 4c064779..313e62da 100644
--- a/foundation/public/less/erpnext-org-theme.less
+++ b/foundation/public/less/erpnext-org-theme.less
@@ -6,3 +6,7 @@
 .logo-img {
 	width: var(--unit-3);
 }
+
+.page-shadow {
+	box-shadow: 0 0 30px -5px var(--light-grey);
+}
diff --git a/foundation/templates/base.html b/foundation/templates/base.html
index 8805094e..e6196cfc 100644
--- a/foundation/templates/base.html
+++ b/foundation/templates/base.html
@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block body %}
-<body data-path="{{ path }}">
+<body class="container m0auto page-shadow" data-path="{{ path }}">
     {%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%}
     {% block content %}
     {{ content }}
diff --git a/foundation/templates/includes/footer/footer.html b/foundation/templates/includes/footer/footer.html
index 60e8509e..317d5bdc 100644
--- a/foundation/templates/includes/footer/footer.html
+++ b/foundation/templates/includes/footer/footer.html
@@ -1,167 +1,152 @@
-<footer class=" section-padding dark-bg">
-	<div class="container">
-		<div class="columns text-left clearfix">
-			<div class="column footer-brand">
-				<div class="bottom-spacer">
-					<img class="footer-icon bottom-spacer" src="/assets/foundation/img/erpnext-logo.svg" alt="ERPnext Logo">
-					<p class="copyright text-muted">&copy; <span id="year"></span> ERPNext Open Source Software Foundation.</br>
-						Content licensed under <a class="footer-link" href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank"> CC-BY-SA 3.0</a> | <a href="/terms" class="footer-link">Terms of use</a>.</p>
-				</div>
-				<div class="bottom-spacer">
-					<div class="inline-block">
-						<form class="js-subscribe-form">
-							<label class="footer-email">
-								<input class="footer-email-input dark-bg"
-								name="email" type="email" placeholder="Your email address">
-							</label>
-							<button type="submit" class="button button-dark">Subscribe</button>
-						</form>
-					</div>
-				</div>
-			</div>
-			<div class="column">
-				<h3 class="footer-title text-white">Industries</h3>
-				<ul class="list-unstyled footer-list">
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/manufacturing">Manufacturing</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/stock">Distribution</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/projects">Services</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/accounts/point-of-sale-pos-invoice">Retail</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/education">Education</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/healthcare">Healthcare</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/agriculture">Agriculture</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/user/manual/en/non_profit">Non Profit</a>
-					</li>
-				</ul>
-			</div>
-			<div class="column">
-				<h3 class="footer-title text-white">Foundation</h3>
-				<ul class="list-unstyled footer-list">
-					<li>
-						<a class="footer-link" href="/about">About</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/blog">Blog</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/members">Memberships</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/foundation-fellow">Fellow</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/bounties">Bounties</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/conf">Conferences</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/contact">Contact</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/login">Member Login</a>
-					</li>
-				</ul>
-			</div>
-			<div class="column">
-				<h3 class="footer-title text-white">Community</h3>
-				<ul class="list-unstyled footer-list">
-					<li>
-						<a class="footer-link" href="/chapters">Chapters</a>
-					</li>
-					<li>
-						<a class="footer-link" href="https://discuss.erpnext.com" target="_blank" >Forum</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/service-providers">Service Providers</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/erpnext-jobs">ERPNext Jobs</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/apps">Apps</a>
-					</li>
-					<li>
-						<a  class="footer-link" href="https://gitter.im/frappe/erpnext" target="_blank" >Chat (Gitter)</a>
-					</li>
-					<li>
-						<a class="footer-link" href="https://github.com/frappe/erpnext" target="_blank" >GitHub</a>
-					</li>
-					<li>
-						<a class="footer-link" href="https://erpnext.com" target="_blank" >ERPNext.com</a>
-					</li>
-				</ul>
-			</div>
-			<div class="column">
-				<h3 class="footer-title text-white">Documentation</h3>
-				<ul class="list-unstyled footer-list">
-					<li>
-						<a class="footer-link" href="/docs/user/manual">Manual</a>
-					</li>
-					<li>
-						<a class="footer-link" href="https://www.youtube.com/c/erpnext" target="_blank" >Video Tutorials</a>
-					</li>
-					<li>
-						<a class="footer-link" href="/docs/current">ERPNext Model & API</a>
-					</li>
-				</ul>
-				<h3 class="footer-title text-white top-spacer">Find Us On</h3>
-				<ul class="list-unstyled footer-list">
-					<li>
-						<a class="footer-link" href="https://twitter.com/erpnext" target="_blank">Twitter</a>,
-					</li>
-					<li>
-						<a class="footer-link" href="https://www.facebook.com/ERPNext/" target="_blank">Facebook</a>
-					</li>
-					<li>
-						<a class="footer-link" href="https://medium.com/frappé-thoughts/" target="_blank">Medium</a>
-					</li>
-				</ul>
-			</div>
+<footer>
+	<div class="border-top flex space-between p4">
+		<div >
+			<h3>Industries</h3>
+			<ul class="list-unstyled">
+				<li>
+					<a  href="/docs/user/manual/en/manufacturing">Manufacturing</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/stock">Distribution</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/projects">Services</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/accounts/point-of-sale-pos-invoice">Retail</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/education">Education</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/healthcare">Healthcare</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/agriculture">Agriculture</a>
+				</li>
+				<li>
+					<a  href="/docs/user/manual/en/non_profit">Non Profit</a>
+				</li>
+			</ul>
+		</div>
+		<div >
+			<h3>Foundation</h3>
+			<ul class="list-unstyled">
+				<li>
+					<a  href="/about">About</a>
+				</li>
+				<li>
+					<a  href="/blog">Blog</a>
+				</li>
+				<li>
+					<a  href="/members">Memberships</a>
+				</li>
+				<li>
+					<a  href="/foundation-fellow">Fellow</a>
+				</li>
+				<li>
+					<a  href="/bounties">Bounties</a>
+				</li>
+				<li>
+					<a  href="/conf">Conferences</a>
+				</li>
+				<li>
+					<a  href="/contact">Contact</a>
+				</li>
+				<li>
+					<a  href="/login">Member Login</a>
+				</li>
+			</ul>
+		</div>
+		<div >
+			<h3>Community</h3>
+			<ul class="list-unstyled">
+				<li>
+					<a  href="/chapters">Chapters</a>
+				</li>
+				<li>
+					<a  href="https://discuss.erpnext.com" target="_blank" >Forum</a>
+				</li>
+				<li>
+					<a  href="/service-providers">Service Providers</a>
+				</li>
+				<li>
+					<a  href="/erpnext-jobs">ERPNext Jobs</a>
+				</li>
+				<li>
+					<a  href="/apps">Apps</a>
+				</li>
+				<li>
+					<a   href="https://gitter.im/frappe/erpnext" target="_blank" >Chat (Gitter)</a>
+				</li>
+				<li>
+					<a  href="https://github.com/frappe/erpnext" target="_blank" >GitHub</a>
+				</li>
+				<li>
+					<a  href="https://erpnext.com" target="_blank" >ERPNext.com</a>
+				</li>
+			</ul>
+		</div>
+		<div >
+			<h3>Documentation</h3>
+			<ul class="list-unstyled">
+				<li>
+					<a  href="/docs/user/manual">Manual</a>
+				</li>
+				<li>
+					<a  href="https://www.youtube.com/c/erpnext" target="_blank" >Video Tutorials</a>
+				</li>
+				<li>
+					<a  href="/docs/current">ERPNext Model & API</a>
+				</li>
+			</ul>
+			<h3>Find Us On</h3>
+			<ul class="list-unstyled">
+				<li>
+					<a  href="https://twitter.com/erpnext" target="_blank">Twitter</a>,
+				</li>
+				<li>
+					<a  href="https://www.facebook.com/ERPNext/" target="_blank">Facebook</a>
+				</li>
+				<li>
+					<a  href="https://medium.com/frappé-thoughts/" target="_blank">Medium</a>
+				</li>
+			</ul>
 		</div>
-		<script type="text/javascript">
-			frappe.ready(function() {
-				var d = new Date();
-				var currentYear = d.getFullYear();
-				$("#year").text(currentYear);
-
-				$('.js-subscribe-form').on('submit', function(e) {
-					e.preventDefault();
-					const form = this;
-					const formdata = new FormData(this);
-					const email = formdata.get('email');
-
-					const input = $(form).find('input');
-					const button = $(form).find('button');
-
-					erpnext.subscribe_to_newsletter({
-						email,
-						callback(r) {
-							if (!r.exc) {
-								form.reset();
-								button.text('Added');
-								setTimeout(() => {
-									button.text('Subscribe');
-								}, 3000);
-							}
-						}
-					})
-				});
-			});
-		</script>
 	</div>
+			<div class="p4 border-top">
+				<div class="bottom-spacer">
+					<span>&copy; <span id="year"></span> ERPNext Open Source Software Foundation. Content licensed under <a  href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank"> CC-BY-SA 3.0</a> | <a href="/terms" >Terms of use</a>.</span>
+				</div>
+			</div>
+	<script type="text/javascript">
+		frappe.ready(function() {
+			var d = new Date();
+			var currentYear = d.getFullYear();
+			$("#year").text(currentYear);
+
+			$('.js-subscribe-form').on('submit', function(e) {
+				e.preventDefault();
+				const form = this;
+				const formdata = new FormData(this);
+				const email = formdata.get('email');
+
+				const input = $(form).find('input');
+				const button = $(form).find('button');
+
+				erpnext.subscribe_to_newsletter({
+					email,
+					callback(r) {
+						if (!r.exc) {
+							form.reset();
+							button.text('Added');
+							setTimeout(() => {
+								button.text('Subscribe');
+							}, 3000);
+						}
+					}
+				})
+			});
+		});
+	</script>
 </footer>
diff --git a/foundation/templates/includes/navbar/navbar.html b/foundation/templates/includes/navbar/navbar.html
index 8c7cdd3d..74ab6f2a 100644
--- a/foundation/templates/includes/navbar/navbar.html
+++ b/foundation/templates/includes/navbar/navbar.html
@@ -1,5 +1,5 @@
 <nav class="navbar" role="navigation">
-	<div class="container flex space-between align-item-center border ph4 pv1">
+	<div class="flex space-between align-item-center border-bottom ph4 pv1">
 		<div class="left">
 			<a class="logo flex align-item-center" href="{{ url_prefix }}{{ home_page or "/"}}">
 				<img class="logo-img mr1" src="/assets/foundation/img/erpnext-logo.svg" alt="Open Source ERP Software">
@@ -7,22 +7,7 @@
 			</a>
 		</div>
 		<div class="right">
-			<ul class="flex list-unstyled m0">
-				<li class="p1">
-					<a href="/service-providers" class="menu-links">Services</a>
-				</li>
-				<li class="p1">
-					<a href="/blog" class="menu-links">Blog</a>
-				</li>
-				<li class="p1">
-					<a href="/about" class="menu-links">About</a>
-				</li>
-				<!--
-				<li class="menu-item">
-					<a class="button get-started button-primary-small" href="/get-started">Get Started</a>
-				</li>
-				-->
-			</ul>
+			{% include 'templates/includes/search_box.html' %}
 		</div>
 	</div>
 </nav>
diff --git a/foundation/templates/web.html b/foundation/templates/web.html
index cbc3716a..597a520a 100644
--- a/foundation/templates/web.html
+++ b/foundation/templates/web.html
@@ -2,7 +2,7 @@
 {% block hero %}{% endblock %}
 {% block content %}
 <main class="page">
-	<div class="page-container flex" id="page-{{ name or route }}"
+	<div class="flex" id="page-{{ name or route }}"
 		data-path="{{ pathname }}" {%- if page_or_generator=="Generator" %} data-doctype="{{ doctype }}"{% endif %}>
 		<div class="page-sidebar flex-1 border-right">
 			{% include "foundation/templates/includes/sidebar/sidebar.html" %}