diff --git a/foundation/erpnext_foundation/doctype/bounty/templates/bounty.html b/foundation/erpnext_foundation/doctype/bounty/templates/bounty.html
index 500bf36a..43512116 100644
--- a/foundation/erpnext_foundation/doctype/bounty/templates/bounty.html
+++ b/foundation/erpnext_foundation/doctype/bounty/templates/bounty.html
@@ -119,4 +119,4 @@
 
 {% endblock %}
 
-<!-- this is a sample default web page template -->
\ No newline at end of file
+<!-- this is a sample default web page template -->
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 fe8b1bf3..f9782b3c 100644
--- a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
+++ b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
@@ -1,15 +1,12 @@
 {% extends "templates/web.html" %}
 
-{% from "foundation/templates/includes/macros.html" import media %}
-
 {% block page_content %}
-<h1 class="media-heading">{{ title }}</h1>
+<h1 class="mb-4">{{ title }}</h1>
 <section>
     <div class="media">
         <a href="#">
             <img class="mr-3 media-img"
-            src="{{ image }}"
-            style="max-width: 80px; ">
+            src="{{ image }}">
         </a>
         <div class="media-body">
             {{ introduction }}
@@ -51,11 +48,11 @@
         </div>
     </div>
 </section>
-<section>
+<section class="mt-4">
     {{ details }}
 </section>
 <section>
-<p><a class='btn-primary btn' href="mailto:{{ email }}">Contact {{ title }}</a></p>
+<p><a class='mt-4 btn-primary btn' href="mailto:{{ email }}">Contact {{ title }}</a></p>
 </section>
 
 {% endblock %}
diff --git a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
index 15e35e7b..f725e4ee 100644
--- a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
+++ b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
@@ -1,6 +1,5 @@
 {% extends "templates/web.html" %}
 
-{% from "foundation/templates/includes/macros.html" import media %}
 {% block page_content %}
 <h1 class="media-heading">{{ title }}</h1>
 {% if membership_type %}
@@ -10,7 +9,7 @@
 	<div class="media">
 		<div class="media-left">
 			<a href="#">
-				<img class="media-object"
+				<img class="media-img media-object"
 					src="{{ image }}">
 			</a>
 		</div>
@@ -49,6 +48,6 @@
 	{{ details }}
 </section>
 <section>
-<p><a class='btn-primary btn' href="mailto:{{ email }}">Contact {{ title }}</a></p>
+<p><a class='mt-4 btn-primary btn' href="mailto:{{ email }}">Contact {{ title }}</a></p>
 </section>
 {% endblock %}
diff --git a/foundation/non_profit/doctype/chapter/templates/chapter_row.html b/foundation/non_profit/doctype/chapter/templates/chapter_row.html
index 44bc52f2..8af3179b 100644
--- a/foundation/non_profit/doctype/chapter/templates/chapter_row.html
+++ b/foundation/non_profit/doctype/chapter/templates/chapter_row.html
@@ -3,8 +3,8 @@
 <div class="mb-4 col-xs-12 col-sm-12">
 	<div class="card">
 		<div class="card-body">
-			<a  href={{ route }}><h5 class="card-title">{{ doc.name | capitalize }}</h5></a>
-			<h6 class="card-subtitle mb-2 text-muted">Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }}</h6>
+			<a  class="dark-link" href={{ route }}><h5 class="card-title">{{ doc.name | capitalize }}</h5></a>
+			<h6 class="card-subtitle mb-2">Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }}</h6>
 			<p class="card-text">
 				{% if members %}
 				{% set index = [] %}
diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html
index c78c122c..c3ff8bf3 100644
--- a/foundation/www/service-providers.html
+++ b/foundation/www/service-providers.html
@@ -1,65 +1,68 @@
 {% extends "templates/web.html" %}
-
 {% from "templates/includes/macros.html" import media %}
-
 {% macro gold_member(m) %}
-<div class="media mb-4 {{ 'text-muted' if m.placeholder else '' }}" style="cursor: pointer;" onclick="location.href='{{ m.route }}'">
-	<a class="mr-3" href="{{ m.route }}">
-		<img class="media-img img-thumbnail" src="{{ m.image or '/assets/foundation/img/gold.png' }}">
-	</a>
-	<div class="media-body">
-		<h4 class="media-heading">{{ m.title }}</h4>
-		{{ m.introduction }}
+<div class="col-sm-6 mb-4">
+<div class="card h-100 {{ 'text-muted' if m.placeholder else '' }}" style="cursor: pointer;" onclick="location.href='{{ m.route }}'">
+	<div class="card-body">
+		<a class="mr-3" href="{{ m.route }}">
+			<img class="media-img" src="{{ m.image or '/assets/foundation/img/gold.png' }}">
+		</a>
+		<h4 class="mt-4">{{ m.title }}</h4>
+		{{ m.introduction | truncate(140) }}
 	</div>
 </div>
+</div>
+
 {% endmacro %}
 
 {% macro silver_member(m) %}
-<div class="col-sm-4">
-	<div class="box clickable {{ 'text-muted' if m.placeholder else '' }}"
+<div class="col-sm-4 mb-4">
+	<div class="card h-100 clickable {{ 'text-muted' if m.placeholder else '' }}"
 		style="cursor: pointer;" onclick="location.href='{{ m.route }}'">
-		<h4>{{ m.title }}</h4>
-		<p>{{ m.introduction | truncate(140) }}</p>
+		<div class="card-body">
+
+		<h4 class="card-title">{{ m.title }}</h4>
+		<p class="card-text">{{ m.introduction | truncate(140) }}</p>
 	</div>
 </div>
+</div>
 {% endmacro %}
 
 {% macro show_member(s) %}
-<div class='col-sm-4'>
-	<h3><a href="/{{ s.route }}">{{ s.title and s.title[:25] }}</a></h3>
-	<p>
-	{{ s.introduction and s.introduction | truncate(140) }}
-	</p>
+<div class="col-sm-4 mb-4">
+	<a class="card-text" href="/{{ s.route }}">{{ s.title and s.title[:25] }}</a>
 </div>
 {% endmacro %}
 
 {% block page_content %}
-<section class="px-3">
+<section class="mb-5">
 	<h3 class="mb-5">Gold Members</h3>
+	<div class="row">
 	{% for m in gold_members %}
 	{{ gold_member(m) }}
 	{% endfor %}
+	</div>
 	{% if has_gold_member %}
 	<p class="pt-3"><a href='/members'>
-		Become a Gold Member and get your company featured here</a></p>
+			Become a Gold Member and get your company featured here</a></p>
 	{% endif %}
 </section>
 
-<section class="my-5 px-3">
+<section class="my-5">
 	<h3 class="mb-5">Silver Members</h3>
 	<div class="row">
-		{% for m in silver_members %}
-		{{ silver_member(m) }}
-		{% endfor %}
-	</div>
+	{% for m in silver_members %}
+	{{ silver_member(m) }}
+	{% endfor %}
+</div>
 	{% if has_silver_member %}
 	<p class="pt-3"><a href='/members'>
 		Become a Silver Member and get your company featured here</a></p>
 	{% endif %}
 </section>
-<section class="my-5 px-3">
+<section class="my-5">
 	<h3 class="mb-5">Individual Members</h3>
-	<div class="row page-padding">
+	<div class="row">
 		{% for s in individual_members %}
 		{{ show_member(s) }}
 		{% endfor %}
@@ -70,8 +73,8 @@
 	{% endif %}
 </section>
 {% if not form_dict.country %}
-<section class="my-5 px-3">
-	<h3>Select by country</h3>
+<section class="my-5">
+	<h3 class="mb-5">Select by country</h3>
 	<div class='row'>
 		{% for c in countries %}
 		<div class='col-xs-2 col-sm-4 col-md-3'>