diff --git a/app/templates/base.html b/app/templates/base.html
index b79cb056ddf8c8e5bd0c797adc7747158470f41b..99661e3f18558a53f4ecc9cf6889c25eab4c1bbc 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -2,69 +2,24 @@
 <html lang="en">
 	<head>
 		<title>{{ title }} | Project Dream Team</title>
+		{% block style %}
 		<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 		<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 		<link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet">
+		{% endblock %}
 		<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.ico') }}">
 	</head>
 	<body>
-		<nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
-			<div class="container topnav">
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-						<span class="sr-only">Toggle navigation</span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</button>
-					<a class="navbar-brand topnav" href="{{ url_for('home.homepage') }}">Project Dream Team</a>
-				</div>
-				<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-					<ul class="nav navbar-nav navbar-right">
-						{% if current_user.is_authenticated %}
-							{% if current_user.is_admin %}
-								<li><a href="{{ url_for('home.admin_dashboard') }}">Dashboard</a></li>
-								<li><a href="{{ url_for('admin.list_departments') }}">Departments</a></li>
-								<li><a href="{{ url_for('admin.list_roles') }}">Roles</a></li>
-								<li><a href="{{ url_for('admin.list_employees') }}">Employees</a></li>
-							{% else %}
-								<li><a href="{{ url_for('home.dashboard') }}">Dashboard</a></li>
-							{% endif %}
-							<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
-							<li><a><i class="fa fa-user"></i>  Hi, {{ current_user.username }}!</a></li>
-						{% else %}
-							<li><a href="{{ url_for('home.homepage') }}">Home</a></li>
-							<li><a href="{{ url_for('auth.register') }}">Register</a></li>
-							<li><a href="{{ url_for('auth.login') }}">Login</a></li>
-						{% endif %}
-					</ul>
-				</div>
-			</div>
-		</nav>
+		{% include "navbar.html" %}
 		<div class="wrapper">
 			{% block body %}
 			{% endblock %}
 			<div class="push"></div>
 		</div>
-		<footer>
-			<div class="container">
-				<div class="row">
-					<div class="col-lg-12">
-						<ul class="list-inline">
-							<li><a href="{{ url_for('home.homepage') }}">Home</a></li>
-							<li class="footer-menu-divider">â‹…</li>
-							{% if current_user.is_authenticated %}
-								<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
-							{% else %}
-								<li><a href="{{ url_for('auth.register') }}">Register</a></li>
-								<li class="footer-menu-divider">â‹…</li>
-								<li><a href="{{ url_for('auth.login') }}">Login</a></li>
-							{% endif %}
-						</ul>
-						<p class="copyright text-muted small">Copyright © 2018. All Rights Reserved</p>
-					</div>
-				</div>
-			</div>
-		</footer>
+		{% block script %}
+		<script src="{{bootstrap_find_resource('jquery.js', cdn='jquery')}}"></script>
+		<script src="{{bootstrap_find_resource('js/bootstrap.js', cdn='bootstrap')}}"></script>
+		{% endblock %}
+		{% include "footer.html" %}
 	</body>
 </html>
diff --git a/app/templates/footer.html b/app/templates/footer.html
new file mode 100644
index 0000000000000000000000000000000000000000..1d6e68ab92914f23e00365b8191e786cb9720454
--- /dev/null
+++ b/app/templates/footer.html
@@ -0,0 +1,20 @@
+<footer>
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-12">
+				<ul class="list-inline">
+					<li><a href="{{ url_for('home.homepage') }}">Home</a></li>
+					<li class="footer-menu-divider">â‹…</li>
+					{% if current_user.is_authenticated %}
+						<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
+					{% else %}
+						<li><a href="{{ url_for('auth.register') }}">Register</a></li>
+						<li class="footer-menu-divider">â‹…</li>
+						<li><a href="{{ url_for('auth.login') }}">Login</a></li>
+					{% endif %}
+				</ul>
+				<p class="copyright text-muted small">Copyright © 2018. All Rights Reserved</p>
+			</div>
+		</div>
+	</div>
+</footer>
diff --git a/app/templates/navbar.html b/app/templates/navbar.html
new file mode 100644
index 0000000000000000000000000000000000000000..27f91b8640ce515839fff13a98b3ab7f0548c698
--- /dev/null
+++ b/app/templates/navbar.html
@@ -0,0 +1,33 @@
+<nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
+	<div class="container topnav">
+		<div class="navbar-header">
+			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+				<span class="sr-only">Toggle navigation</span>
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+			</button>
+			<a class="navbar-brand topnav" href="{{ url_for('home.homepage') }}">Project Dream Team</a>
+		</div>
+		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+			<ul class="nav navbar-nav navbar-right">
+				{% if current_user.is_authenticated %}
+					{% if current_user.is_admin %}
+						<li><a href="{{ url_for('home.admin_dashboard') }}">Dashboard</a></li>
+						<li><a href="{{ url_for('admin.list_departments') }}">Departments</a></li>
+						<li><a href="{{ url_for('admin.list_roles') }}">Roles</a></li>
+						<li><a href="{{ url_for('admin.list_employees') }}">Employees</a></li>
+					{% else %}
+						<li><a href="{{ url_for('home.dashboard') }}">Dashboard</a></li>
+					{% endif %}
+					<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
+					<li><a><i class="fa fa-user"></i>  Hi, {{ current_user.username }}!</a></li>
+				{% else %}
+					<li><a href="{{ url_for('home.homepage') }}">Home</a></li>
+					<li><a href="{{ url_for('auth.register') }}">Register</a></li>
+					<li><a href="{{ url_for('auth.login') }}">Login</a></li>
+				{% endif %}
+			</ul>
+		</div>
+	</div>
+</nav>