diff --git a/server.py b/server.py
index 153082cc41020407228658fdb0673dddefc24968..446f8ee27a3104a9990790754f6a862e04a566ac 100755
--- a/server.py
+++ b/server.py
@@ -46,11 +46,11 @@ def index():
 
 @app.route('/videos')
 def videos():
-	return render_template('videos.html', active_page='videos')
+	return render_template('videos.html')
 
 @app.route('/faq')
 def faq():
-	return render_template('faq.html',  active_page='faq')
+	return render_template('faq.html')
 
 if __name__ == '__main__':
 	app.debug = True
diff --git a/templates/base.html b/templates/base.html
index fcafeeb3066d1eedfe546195929cad3607683c40..e45f5ab689158a5981d5153add94869c652507c9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,6 +16,7 @@
 	</head>
 	<body>
 		{%include "header.html" %}
+		{% set active_page = active_page %}
 		{% block content %}
 		<h1>This is a Heading</h1>
 		<p>This is a paragraph.</p>
diff --git a/templates/faq.html b/templates/faq.html
index 3e07b954032c8139ff2dc3b23909b3acc9744b9f..924624500fb42f36f8828391b2425464216b36e7 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -1,5 +1,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
+{% set active_page = "faq" %}
 {% block content %}
 <div class="container">
 	<br />
diff --git a/templates/index.html b/templates/index.html
index 6c3b1049348498c8d38fb33ab977c44ff2a8861b..5fe4361c861f47b6f08dd706ab9e765e8248310b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
+{% set active_page = "index" %}
 {% block content %}
 <div class="container-fluid">
 	<div class="row">
diff --git a/templates/videos.html b/templates/videos.html
index 1d8ca65ed429ace7fad2104282efac8604a0066e..142826f34ba94540e44f66315e14446dd90cd987 100644
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -1,5 +1,5 @@
-{% from 'macros.html' import preview %}
 {% extends "base.html" %}
+{% set active_page = "videos" %}
 {% block content %}
 <div class="container-fluid">
 </div>