diff --git a/NP_Custom_Templates/customer_templates/Stripe/_courses_partnertraining_index.html.liquid b/NP_Custom_Templates/customer_templates/Stripe/_courses_partnertraining_index.html.liquid
index c62ede62..130e153b 100644
--- a/NP_Custom_Templates/customer_templates/Stripe/_courses_partnertraining_index.html.liquid
+++ b/NP_Custom_Templates/customer_templates/Stripe/_courses_partnertraining_index.html.liquid
@@ -102,17 +102,24 @@
 							{% comment %} In Progress courses {% endcomment %}
 							{% if courses_in_progress.size > 0 %}
 								{% for course in courses_in_progress %}
-									{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+									{% for category in course.categories %}
+										{% if category.name == 'Partner Training'%}
+											{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+										{% endif %}
+									{% endfor %}
 								{% endfor %}
 							{% endif %}
 
 							{% comment %} Enrolled courses {% endcomment %}
 							{% if courses_enrolled.size > 0 %}
 								{% for course in courses_enrolled %}
-									{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+									{% for category in course.categories %}
+										{% if category.name == 'Partner Training'%}
+											{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+										{% endif %}
+									{% endfor %}
 								{% endfor %}
 							{% endif %}
-
 						</div>
 					{% endif %}
 
@@ -123,7 +130,11 @@
 						</h3>
 						<div class="blocks-layout">
 							{% for course in courses_completed %}
-								{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+								{% for category in course.categories %}
+									{% if category.name == 'Partner Training'%}
+										{% include "cards_course", course: course, card_classes: "col-x-sm-6 col-sm-6 col-md-4 col-lg-3" %}
+									{% endif %}
+								{% endfor %}
 							{% endfor %}
 						</div>
 					{% endif %}
@@ -141,5 +152,4 @@
 		</div>
 	</div>
 </main>
-{% include "footer" %}
-}}
\ No newline at end of file
+{% include "footer" %}
\ No newline at end of file
diff --git a/NP_Custom_Templates/customer_templates/Stripe/homepage.html.liquid b/NP_Custom_Templates/customer_templates/Stripe/homepage.html.liquid
index 9cce9830..fee2f429 100644
--- a/NP_Custom_Templates/customer_templates/Stripe/homepage.html.liquid
+++ b/NP_Custom_Templates/customer_templates/Stripe/homepage.html.liquid
@@ -9,21 +9,24 @@
 			{% case role %}	
 			{% when 'developer', 'architect' %}
 			<div class="np-homepage-subheadline np-header-font-color">
-				Hi {{ current_person.first_name }}, how is the weather in {{ current_person.properties.location }}?
-				Here is the training you are eligible for in your role as {{ current_person.properties.role }}.
+				<span>Hi {{ current_person.first_name }}, how is the weather in {{ current_person.properties.location }}?</span>
+				<br>
+				<span>Here is the training you are eligible for in your role as {{ current_person.properties.role }}.</span>
 			</div>
 			{% else %}
 			<div class="np-homepage-subheadline np-header-font-color">
-				Hi {{ current_person.first_name }}, how is the weather in {{ current_person.properties.location }}?
-				Here is the training you are eligible for in your role as 
+				<span>Hi {{ current_person.first_name }}, how is the weather in {{ current_person.properties.location }}?</span>
+				<br>
+				<span>Here is the training you are eligible for in your role as 
 					<div class="dropdown">
-					<button class="dropbtn">Select Role ▼ </button>
-					<div class="dropdown-content">
-						<a href="#">Developer</a>
-						<a href="#">Architect</a>
-						<a href="#">Partner</a>
+						<button class="dropbtn">Select Role ▼ </button>
+						<div class="dropdown-content">
+							<a href="#">Developer</a>
+							<a href="#">Architect</a>
+							<a href="#">Partner</a>
+						</div>
 					</div>
-				</div>
+				</span>
 			</div>
 			{% endcase %}
 		</div>