diff --git a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
index c733dd1b..bdfc1cbc 100644
--- a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
+++ b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
@@ -5,7 +5,7 @@
 {% block page_content %}
 <h1 class="media-heading">{{ title }}</h1>
 <section>
-    <div class="media" style="margin: 45px 0px; ">
+    <div class="media">
         <div class="media-left" style='min-width: 80px;'>
             <a href="#">
                 <img class="media-object"
diff --git a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_row.html b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_row.html
index 049a778b..b6408e96 100644
--- a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_row.html
+++ b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_row.html
@@ -1,11 +1,16 @@
-<div style='margin-bottom: 30px; max-width: 600px;'
-    class='with-border clickable'>
-    <a href="/{{ doc.route }}">
-        <h3 style='margin-top: 0px;'>{{ doc.title }}</h3>
-        <p>
+<div class="media max-width-medium clickable" style="cursor: pointer;" onclick="location.href='{{ doc.route }}'">
+		<div class="media-left">
+			<a href="{{ link or "#" }}">
+				<img class="media-object"
+					src="{% if image %}{% if not '/' in image %}/assets/foundation/img/{% endif %}{{ image }}{% else %}/assets/foundation/img/frappe-bird-grey.svg{% endif %}"
+					style="{% if image and not '/' in image %}opacity: 0.4{% endif %}">
+			</a>
+		</div>
+		<div class="media-body">
+			{% if title %}<h4 class="media-heading">{{ doc.title }}</h4>{% endif %}
+			 <p>
             <span class='label'>{{ frappe.format_date(doc.creation) }}</span>
             <span class='label'>{{ doc.country }}</span>
-
-        </p>
-    </a>
+			</p>
+        </div>
 </div>
diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css
index 8b35eef7..f1f391e1 100644
--- a/foundation/public/css/erpnext-org-theme.css
+++ b/foundation/public/css/erpnext-org-theme.css
@@ -152,6 +152,9 @@ a:visited {
   }
 }
 /*utilities*/
+.align-items-center {
+  align-items: center;
+}
 .hide,
 .hidden {
   display: none;
@@ -404,9 +407,14 @@ hr {
 }
 .footer-end {
   border-top: 1px solid #EBEFF2;
-  padding: 2rem 2.5rem;
+  padding: 2rem 1rem;
   font-size: 0.75rem;
 }
+@media screen and (min-width: 767px) {
+  .footer-end {
+    padding: 2rem 2.5rem;
+  }
+}
 .footer-end a {
   color: #8D99A6;
 }
@@ -417,7 +425,7 @@ hr {
   width: 1.5rem;
   margin-right: .5em;
 }
-/* loaned from bootstrap*/
+/* loaned from bootstrap need to cleanup*/
 /*progress bar*/
 .progress {
   height: 1.5rem;
@@ -790,7 +798,8 @@ img.blog-cover-image,
 .inline-block {
   display: inline-block;
 }
-.blog-container {
+.blog-container,
+.max-width-medium {
   max-width: 700px;
 }
 .media {
@@ -825,23 +834,22 @@ img.blog-cover-image,
   background-color: #fafbfc;
 }
 /* individual elements */
-.row.page-head {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-}
-@media screen and (min-width: 767px) {
-  .row.page-head {
+/*.row.page-head {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    @media screen and (min-width: @screen-xs) {
     flex-direction: row;
-  }
+    }
 }
+
 .item-search .input-wrapper {
-  margin-right: 1.5rem;
+    margin-right: 1.5rem;
 }
 .item-search i {
-  margin-right: -1.5rem;
-  margin-top: .5rem;
-}
+    margin-right: -1.5rem;
+    margin-top: .5rem;
+}*/
 .gold-member {
   display: flex;
   padding: 2.5rem 0;
diff --git a/foundation/public/img/education.png b/foundation/public/img/education.png
index b57ab409..4a3bd28a 100644
Binary files a/foundation/public/img/education.png and b/foundation/public/img/education.png differ
diff --git a/foundation/public/img/non-profit.png b/foundation/public/img/non-profit.png
new file mode 100644
index 00000000..eb8db7dc
Binary files /dev/null and b/foundation/public/img/non-profit.png differ
diff --git a/foundation/public/img/non-profit.svg b/foundation/public/img/non-profit.svg
deleted file mode 100644
index 6ced0e72..00000000
--- a/foundation/public/img/non-profit.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="374.7666"
-   height="374.7666"
-   viewBox="0 0 99.156994 99.157002"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="non-profit.svg">
-  <defs
-     id="defs2">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath928">
-      <rect
-         ry="35.271599"
-         rx="35.271599"
-         y="36.632778"
-         x="79.439369"
-         height="99.156998"
-         width="99.156998"
-         id="rect930"
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         transform="scale(-1,1)" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath863">
-      <rect
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         id="rect866"
-         width="99.157104"
-         height="99.156998"
-         x="21.70915"
-         y="66.834236"
-         rx="35.271599"
-         ry="35.271599"
-         transform="scale(-1,1)" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath1016">
-      <path
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         d="m -236.921,38.602797 h -24.65136 c -16.83449,0 -30.38719,13.552685 -30.38719,30.387188 v 24.651361 c 0,16.834494 13.5527,30.387184 30.38719,30.387184 h 24.65136 c 16.83451,0 30.38719,-13.55269 30.38719,-30.387184 V 68.989985 c 0,-16.834503 -13.55268,-30.387188 -30.38719,-30.387188 z"
-         id="path1018"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath1020">
-      <path
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         d="m -74.368778,20.385444 h -30.075052 c -20.53835,0 -37.07284,16.534489 -37.07284,37.072848 v 30.075049 c 0,20.538349 16.53449,37.072849 37.07284,37.072849 h 30.075052 c 20.538359,0 37.072848,-16.5345 37.072848,-37.072849 V 57.458292 c 0,-20.538359 -16.534489,-37.072848 -37.072848,-37.072848 z"
-         id="path1022"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3886">
-      <path
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         d="m -67.91716,75.091495 h -9.917561 c -6.772734,0 -12.225157,5.45242 -12.225157,12.225158 v 9.917561 c 0,6.772736 5.452423,12.225156 12.225157,12.225156 h 9.917561 c 6.772738,0 12.225158,-5.45242 12.225158,-12.225156 v -9.917561 c 0,-6.772738 -5.45242,-12.225158 -12.225158,-12.225158 z"
-         id="path3888"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3893">
-      <path
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         d="m 114.71097,36.632778 h 28.6138 c 19.54046,0 35.2716,15.731133 35.2716,35.2716 v 28.613802 c 0,19.54046 -15.73114,35.2716 -35.2716,35.2716 h -28.6138 c -19.540468,0 -35.271601,-15.73114 -35.271601,-35.2716 V 71.904378 c 0,-19.540467 15.731133,-35.2716 35.271601,-35.2716 z"
-         id="path3895"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3556">
-      <rect
-         y="299.53384"
-         x="207.14764"
-         height="10.111938"
-         width="13.025642"
-         id="rect3558"
-         style="opacity:1;vector-effect:none;fill:#a84f2e;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath1515">
-      <path
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         d="m -114.71097,36.632778 h -28.6138 c -19.54046,0 -35.2716,15.731133 -35.2716,35.271599 v 28.613803 c 0,19.54046 15.73114,35.2716 35.2716,35.2716 h 28.6138 c 19.540468,0 35.271601,-15.73114 35.271601,-35.2716 V 71.904377 c 0,-19.540466 -15.731133,-35.271599 -35.271601,-35.271599 z"
-         id="path1517"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="-108.47599"
-     inkscape:cy="87.197231"
-     inkscape:document-units="px"
-     inkscape:current-layer="g1190"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1149"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     units="px"
-     inkscape:snap-global="false"
-     showguides="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(147.74731,-47.323559)">
-    <g
-       id="g1190"
-       transform="matrix(-1,0,0,1,-227.18668,10.690781)">
-      <rect
-         style="opacity:1;vector-effect:none;fill:#f0f4f7;fill-opacity:1;stroke:none;stroke-width:5.29166698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-         id="rect902"
-         width="99.156998"
-         height="99.156998"
-         x="79.439369"
-         y="36.632778"
-         transform="scale(-1,1)"
-         rx="35.271599"
-         ry="35.271599" />
-      <g
-         id="g936"
-         transform="matrix(1.1607392,0,0,1.1607392,160.29252,-8.1750014)"
-         style="stroke-width:0.86151993"
-         clip-path="url(#clipPath1016)" />
-      <g
-         style="display:inline;stroke-width:0.53841794"
-         transform="matrix(-1.8569321,0,0,1.8576537,320.00887,-398.82196)"
-         id="g3445"
-         clip-path="none">
-        <g
-           id="g943"
-           transform="matrix(-0.33848628,0,0,0.3383548,215.25328,225.12886)"
-           style="stroke-width:1.59097338"
-           clip-path="none">
-          <path
-             sodipodi:nodetypes="cssscsc"
-             inkscape:connector-curvature="0"
-             id="path887"
-             d="m -109.18949,91.980206 c 12.19693,2.579277 17.456294,11.977414 17.456294,22.722414 2e-6,12.80319 -4.485298,52.82044 -35.300554,38.61786 -11.92355,-5.49549 -12.24383,-25.81467 -12.24383,-38.61786 0,-10.71937 5.57811,-19.845189 17.70497,-22.545349 0.16049,1.002713 -2.24704,4.744221 5.08333,4.734406 8.09024,-0.01083 6.74574,-3.018844 7.29979,-4.911471 z"
-             style="opacity:1;vector-effect:none;fill:#8D99A6;fill-opacity:1;stroke:none;stroke-width:1.59097338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-          <path
-             sodipodi:nodetypes="sssss"
-             inkscape:connector-curvature="0"
-             id="ellipse889"
-             d="m -126.31305,73.38162 c 0,7.22933 3.24292,17.363026 11.43958,17.363026 8.19666,0 11.81756,-10.133696 11.81756,-17.363026 0,-7.229329 -3.43191,-13.089857 -11.62857,-13.089858 -8.19666,1e-6 -11.62857,5.860529 -11.62857,13.089858 z"
-             style="opacity:1;vector-effect:none;fill:#8D99A6;fill-opacity:1;stroke:none;stroke-width:1.59097314;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-          <ellipse
-             ry="2.854038"
-             rx="1.1083163"
-             transform="matrix(-0.89769352,-0.4406204,-0.15127678,0.98849144,0,0)"
-             cy="120.27486"
-             cx="94.967995"
-             id="path900"
-             style="opacity:1;vector-effect:none;fill:#8D99A6;fill-opacity:1;stroke:none;stroke-width:1.6288631;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-          <ellipse
-             style="opacity:1;vector-effect:none;fill:#8D99A6;fill-opacity:1;stroke:none;stroke-width:1.6288631;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-             id="ellipse902"
-             cx="-142.70425"
-             cy="14.332372"
-             transform="matrix(0.89769352,-0.4406204,0.15127678,0.98849144,0,0)"
-             rx="1.1083163"
-             ry="2.854038" />
-        </g>
-        <g
-           id="g936-3"
-           transform="matrix(-0.41295859,0,0,0.41279818,142.58752,214.77378)"
-           style="stroke-width:1.30405962"
-           clip-path="none">
-          <path
-             style="opacity:1;vector-effect:none;fill:#8D99A6;fill-opacity:1;stroke:#f0f4f7;stroke-width:1.30405962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-             d="m -225.25425,93.949071 c 12.19694,2.579277 14.11941,11.838769 15.78147,22.454449 5.27154,33.66969 -8.55232,41.12248 -21.68134,41.12248 -13.12903,0 -33.02579,18.98754 -25.12369,-28.30699 1.76653,-10.57281 2.82895,-32.459707 14.95581,-35.159867 1.17713,7.354567 -0.97417,12.996137 6.3562,12.986317 8.09024,-0.0108 7.5562,-5.73368 9.71155,-13.096389 z"
-             id="path906"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssscsc" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path916"
-             d="m -229.2681,61.1005 c 0.47298,-0.0043 0.9724,0.06386 1.52807,0.245978 3.56078,1.167008 5.74767,4.093702 7.12153,7.579899 2.88678,7.325263 3.17758,22.51749 3.17758,22.51749 0,0 -6.33612,1.278242 -10.34665,1.643311 2.50047,-1.769549 4.145,-4.898665 5.02243,-8.174178 a 0.92946307,2.5481372 5.890335 0 0 0.0419,0.02481 0.92946307,2.5481372 5.890335 0 0 1.264,-2.066541 0.92946307,2.5481372 5.890335 0 0 -0.4749,-2.916619 c -3.53923,0.534384 -8.05668,-7.109796 -10.30739,-11.425658 -2.32865,4.4358 -6.75709,11.800152 -10.21332,11.131103 -0.0461,-0.0089 -0.0901,-0.02016 -0.13488,-0.03049 0.002,0.09646 0.002,0.191119 0.005,0.288353 a 2.5481372,0.92946307 84.109665 0 0 -0.0625,0.02119 2.5481372,0.92946307 84.109665 0 0 -0.49868,2.932121 2.5481372,0.92946307 84.109665 0 0 1.26091,2.067573 c 0.76892,3.079665 2.18864,6.025986 4.38939,7.832082 -4.57252,-0.394753 -8.87698,-0.926042 -8.87698,-0.926042 0,0 -1.16449,-15.416591 1.67019,-22.9185 1.08362,-2.867781 3.15694,-5.744988 5.94692,-7.015591 1.56088,-0.710853 3.44086,0.261223 5.14491,0.06666 1.74294,-0.199009 2.92341,-0.864111 4.34237,-0.876948 z"
-             style="fill:#8D99A6;fill-opacity:1;stroke:none;stroke-width:0.34503245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        </g>
-      </g>
-      <path
-         style="fill:#8D99A6;fill-opacity:1;stroke:#f0f4f7;stroke-width:2.64583325;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m -142.93937,96.858229 c -6.79507,6.747571 10.13786,8.545901 24.56845,12.473211 -11.99784,5.58427 -19.59896,3.14553 -27.21428,1.13393 -10.01637,-2.64583 -24.0015,-16.630951 -26.26935,-13.229166 6.4256,22.111606 14.74106,27.403276 22.11159,32.505956 25.86732,15.36056 41.49804,-3.31209 77.485138,-2.83481 l -0.377976,-27.970251 c -29.132592,2.821741 -36.988882,-1.382 -70.303572,-2.07887 z"
-         id="path1509"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsccccc"
-         clip-path="url(#clipPath1515)" />
-    </g>
-  </g>
-</svg>
diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less
index ae2c5bba..80378b47 100644
--- a/foundation/public/less/erpnext-org-theme.less
+++ b/foundation/public/less/erpnext-org-theme.less
@@ -161,6 +161,10 @@ a {
 }
 
 /*utilities*/
+.align-items-center {
+	align-items: center;
+}
+
 .hide, .hidden {
     display: none;
 	visibility: hidden;
@@ -438,8 +442,11 @@ hr {
 
 .footer-end {
     border-top: 1px solid @light-border-color;
-    padding: 2rem 2.5rem;
-    font-size: 0.75rem;
+    padding: 2rem 1rem;
+	font-size: 0.75rem;
+	@media screen and (min-width: @screen-xs) {
+		padding: 2rem 2.5rem;
+	}
 }
 
 .footer-end a {
@@ -453,7 +460,7 @@ hr {
     width: 1.5rem;
     margin-right: .5em;
 }
-/* loaned from bootstrap*/
+/* loaned from bootstrap need to cleanup*/
 /*progress bar*/
 .progress {
   height: 1.5rem;
@@ -852,7 +859,7 @@ img.blog-cover-image, .blog-text img, .screenshot {
     display: inline-block;
 }
 
-.blog-container {
+.blog-container, .max-width-medium {
     max-width: 700px;
 }
 
@@ -891,7 +898,7 @@ img.blog-cover-image, .blog-text img, .screenshot {
 }
 
 /* individual elements */
-.row.page-head {
+/*.row.page-head {
     display: flex;
     align-items: center;
     flex-direction: column;
@@ -906,7 +913,7 @@ img.blog-cover-image, .blog-text img, .screenshot {
 .item-search i {
     margin-right: -1.5rem;
     margin-top: .5rem;
-}
+}*/
 .gold-member{
     display: flex;
     padding: 2.5rem 0;
diff --git a/foundation/templates/base.html b/foundation/templates/base.html
index 71b711fe..8016adfd 100644
--- a/foundation/templates/base.html
+++ b/foundation/templates/base.html
@@ -39,11 +39,11 @@
 </head>
 <body data-path="{{ path }}">
     <div class="wrapper">
-        {%- block navbar -%}{% include "foundation/templates/includes/navbar/navbar.html" %}{%- endblock -%}
+        {%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%}
         {% block content %}
             {{ content }}
         {% endblock %}
-        {%- block footer -%}{% include "foundation/templates/includes/footer/footer.html" %}{%- endblock -%}
+        {%- block footer -%}{% include "templates/includes/footer/footer.html" %}{%- endblock -%}
     </div>
         {% block base_scripts %}
         <!-- js should be loaded in body! -->
diff --git a/foundation/templates/includes/footer/footer.html b/foundation/templates/includes/footer/footer.html
index 031b741f..f94f3a5c 100644
--- a/foundation/templates/includes/footer/footer.html
+++ b/foundation/templates/includes/footer/footer.html
@@ -118,19 +118,19 @@
     </div>
     <div class="footer-end dark-bg text-muted">
         <div class="container">
-            <div class="three-column">
-                <div class="column">
+            <div class="align-iten-center three-column">
+                <div class="columns">
                 <p><img class="footer-icon" src="/assets/foundation/img/erpnext-logo.svg">
                     &copy; <span id="year"></span> ERPNext Open Source Software Foundation.</p>
                 </div>
-                <div class="column">
+                <div class="columns>
                     <p>Find us on
                         <a class="secondary-link" href="https://twitter.com/erpnext" target="_blank">Twitter</a>,
                         <a class="secondary-link" href="https://www.facebook.com/ERPNext/" target="_blank">Facebook</a> &
                         <a class="secondary-link" href="https://medium.com/frappé-thoughts/" target="_blank">Medium</a>
                     </p>
                 </div>
-                <div class="column">
+                <div class="columns">
                     <p>Content licensed under <a class="secondary-link" href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank"> CC-BY-SA 3.0</a>. Read the <a href="/terms" class="secondary-link">terms of use</a>.
                     </p>
                 </div>
diff --git a/foundation/www/index.html b/foundation/www/index.html
index 2f64f99d..e2acd84f 100644
--- a/foundation/www/index.html
+++ b/foundation/www/index.html
@@ -44,8 +44,8 @@
 					<img class="domain-image" src="/assets/foundation/img/healthcare.png" alt="ERP software for Healthcare"><span>Healthcare</span></a>
             </li>
             <li class="list-items">
-				<a class="primary-links domain-links" href="/docs/user/manual/en/non-profits">
-                <img class="domain-image" src="/assets/foundation/img/non-profit.svg" alt="ERP software for Non-Profits"><span>Non-Profits</span></a>
+				<a class="primary-links domain-links" href="/docs/user/manual/en/non_profit">
+                <img class="domain-image" src="/assets/foundation/img/non-profit.png" alt="ERP software for Non-Profits"><span>Non Profit</span></a>
             </li>
         </ul>
 	</div>