diff --git a/templates/author.html b/templates/author.html
index 2c9d953..94485e7 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,10 +1,9 @@
-{% extends "base.html" %}
-{% block main_content %}
+{% extends "base.html" %} {% block main_content %}
 		<h3><center>Author</center></h3>
 		<div class="container">
 		<right>
 			{% if message|length %}
-				<div class="row alert alert-success">
+				<div class="row alert alert-{{alert}}">
 				{{message}}
 				</div>
 			{% endif %}
@@ -20,7 +19,8 @@
 					<div class="col-xl-12">
 					<br></br>
 					</div>
-					{{ wtf.form_field( author_form.submit, button_map={'submit':'primary'}, horizontal_columns=('xl', 2, 10), class="btn btn-primary offset-xl-1 col-xl-2" )}}
+					{{ wtf.form_field( author_form.submit, horizontal_columns=('xl', 2, 2), class="btn btn-primary offset-xl-1 col-xl-2" )}}
+					{{ wtf.form_field( author_form.delete, horizontal_columns=('xl', 2, 2), class="btn btn-danger offset-xl-1 col-xl-2" )}}
 				</form>
 			</div class="row">
 		</div class="container">
diff --git a/templates/authors.html b/templates/authors.html
index bb3e727..7c9c6d3 100644
--- a/templates/authors.html
+++ b/templates/authors.html
@@ -4,13 +4,11 @@
 <h3>Authors</h3>
 <table id="book_table" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
 	<thead>
-		<tr class="thead-light"><th>Surname</th><th>Firstname(s)</th><th>Action</th></tr>
+		<tr class="thead-light"><th>Surname</th><th>Firstname(s)</th></tr>
 	</thead>
 	<tbody>
 	{% for author in authors %}
-		<tr><td>{{author.surname}}</td><td>{{author.firstnames}}</td><td>
-		icons for: E, D
-		</td></tr>
+		<tr><td><a href="{{url_for('author', id=author.id )}}">{{author.surname}}</a></td><td>{{author.firstnames}}</td></tr>
 	{% endfor %}
 	</tbody>
 </table>
diff --git a/templates/base.html b/templates/base.html
index 5ead55c..09d883f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,13 +24,13 @@
 				<div class="nav-item dropdown">
 					<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="BookMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Books</a>
 					<div class="dropdown-menu" aria-labelledby="BookMenu">
-						<a class="dropdown-item" href="#">Show All</a>
+						<a class="dropdown-item" href="{{url_for('books')}}">Show All</a>
 					</div>
 				</div>
 				<div class="nav-item dropdown">
 					<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AuthorMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Authors</a>
 					<div class="dropdown-menu" aria-labelledby="AuthorMenu">
-						<a class="dropdown-item" href="/authors">Show All</a>
+						<a class="dropdown-item" href="{{url_for('authors')}}">Show All</a>
 					</div>
 				</div>
 				<div class="nav-item dropdown">
diff --git a/templates/book.html b/templates/book.html
new file mode 100644
index 0000000..924ab1f
--- /dev/null
+++ b/templates/book.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% block main_content %}
+	<h3><center>View/Edit Book</center></h1>
+		{% set keys = [ 'title', 'author', 'publisher', 'genre', 'owned', 'covertype', 'condition', 'year_published', 'rating', 'notes', 'blurb' ] %}
+		<div class="container">
+			<div class="row with-margin">
+				<form class="form col-lg-12">
+				{% for key in keys %}
+					<div class="input-group input-group-lg">
+						<label for="{{key}}" class="col-lg-2 col-form-label">{{key}}:</label>
+						<div class="col-lg-10">
+						{% if books[key] is iterable and books[key] is not string %}
+							<table>
+							{% for objects in books[key] %}
+								<tr>
+								{% for attr in objects %}
+									{% if attr != "id" %}
+										<td>
+										<input type="text" class="form-control input-lg" id="not-sure-{{key}}-{{attr}}" value="{{objects[attr]}}">
+										</td>
+									{% endif %}
+								{% endfor %}
+								</tr>
+							{% endfor %}
+							</table>
+						{% else %}
+							{% if key == "notes" or key == "blurb" %}
+								<textarea rows="5" type="text" class="form-control input-lg" id="{{key}}">{{books[key]}}</textarea>
+							{% else %}
+								<input type="text" class="form-control input-lg" id="{{key}}" value="{{books[key]}}">
+							{% endif %}
+						{% endif %}
+						</div class="col-lg-8">
+					</div class="form-group">
+				{% endfor %}
+				</form>
+			</div class="row">
+		</div class="container">
+		{% if books.sub_book|length %}
+			<p>sub_book is defined: {{books.sub_book}}</p>
+		{% endif %}
+		{{ books.subs }}
+{% endblock main_content %}
diff --git a/templates/books.html b/templates/books.html
index ac10790..ec6b829 100644
--- a/templates/books.html
+++ b/templates/books.html
@@ -1,18 +1,5 @@
-<html>
-	<head>
-	  <!-- Required meta tags -->
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-		<!-- Bootstrap CSS -->
-		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-		<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.0/dist/bootstrap-table.min.css">
-		<link rel="stylesheet" href="https://cdn.datatables.net/1.10.22/css/dataTables.bootstrap4.min.css">
-		<script src="https://kit.fontawesome.com/9b4c7cf470.js" crossorigin="anonymous"></script>
-	</head>
-	<body>
-
-	{% if books is not mapping %}
+{% extends "base.html" %}
+{% block main_content %}
 	<h3>All Books</h1>
 	<table id="book_table" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
 	  <thead>
@@ -43,58 +30,4 @@
       {% endfor %}
 	</tbody>
 	</table>
-	{% else %}
-	<h3><center>View/Edit Book</center></h1>
-		{% set keys = [ 'title', 'author', 'publisher', 'genre', 'owned', 'covertype', 'condition', 'year_published', 'rating', 'notes', 'blurb' ] %}
-		<div class="container">
-			<div class="row with-margin">
-				<form class="form col-lg-12">
-				{% for key in keys %}
-					<div class="input-group input-group-lg">
-						<label for="{{key}}" class="col-lg-2 col-form-label">{{key}}:</label>
-						<div class="col-lg-10">
-						{% if books[key] is iterable and books[key] is not string %}
-							<table>
-							{% for objects in books[key] %}
-								<tr>
-								{% for attr in objects %}
-									{% if attr != "id" %}
-										<td>
-										<input type="text" class="form-control input-lg" id="not-sure-{{key}}-{{attr}}" value="{{objects[attr]}}">
-										</td>
-									{% endif %}
-								{% endfor %}
-								</tr>
-							{% endfor %}
-							</table>
-						{% else %}
-							{% if key == "notes" or key == "blurb" %}
-								<textarea rows="5" type="text" class="form-control input-lg" id="{{key}}">{{books[key]}}</textarea>
-							{% else %}
-								<input type="text" class="form-control input-lg" id="{{key}}" value="{{books[key]}}">
-							{% endif %}
-						{% endif %}
-						</div class="col-lg-8">
-					</div class="form-group">
-				{% endfor %}
-				</form>
-			</div class="row">
-		</div class="container">
-		{% if books.sub_book|length %}
-			<p>sub_book is defined: {{books.sub_book}}</p>
-		{% endif %}
-		{{ books.subs }}
-	{% endif %}
-
-	<!-- code to get bootstrap & bootstrap datatable to work -->
-	<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
-	<script src="https://cdn.datatables.net/1.10.22/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.10.22/js/dataTables.bootstrap4.min.js"></script>
-	<script>
-	$(document).ready(function() { 
-		$('#book_table').DataTable( { 'pageLength': 25 } );
-	} );
-	</script>
-	</body>
-</html>
+{% endblock main_content %}