diff --git a/templates/author.html b/templates/author.html
index 518702c..6bd696c 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -6,37 +6,32 @@
 
          <!-- 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">
-         <script src="https://kit.fontawesome.com/9b4c7cf470.js" crossorigin="anonymous"></script>
+
+		{% import "bootstrap/wtf.html" as wtf %}
  	</head>
 
 	<body>
-	<h3><center>Author</center></h3>
+		<h3><center>Author</center></h3>
 		<div class="container">
+		<right>
 			{% if message|length %}
 				<div class="row alert alert-success">
 				{{message}}
 				</div>
 			{% endif %}
-			<div class="row with-margin">
-				<form class="form col-lg-12" action="" method="POST">
-					<input type="hidden" name="author.id" id="author.id" value="{{author.id}}">
-					<div class="input-group input-group-lg">
-						<label for="{{author.firstnames}}" class="col-lg-2 col-form-label">Firstnames:</label>
-						<div class="col-lg-10">
-							<input type="text" class="form-control input-lg" name="author.firstnames" id="author.firstnames" value="{{author.firstnames}}">
-						</div class="col-lg-10">
-					</div class="input-group">
-					<div class="input-group input-group-lg">
-						<label for="{{author.surname}}" class="col-lg-2 col-form-label">Surname:</label>
-						<div class="col-lg-10">
-							<input type="text" class="form-control" name="author.surname" id="author.surname" value="{{author.surname}}">
-						</div class="col-lg-10">
-					</div class="input-group">
-					<div class="input-group input-group-lg">
-						<div class="col-lg-2">
-							<input class="btn btn-primary" type="submit" id="save" value="Save">
-						</div class="col-lg-2">
-					</div class="input-group input-group-lg">
+			<div class="row">
+				<form class="form form-inline col-xl-12" action="" method="POST">
+					{{ wtf.form_field( author_form.id, form_type='inline' ) }}
+					<div class="col-xl-12">
+					{{ wtf.form_field( author_form.firstnames, form_type='horizontal', horizontal_columns=('xl', 2, 10), style="width:100%" ) }}
+					</div>
+					<div class="col-xl-12">
+					{{ wtf.form_field( author_form.surname, form_type='horizontal', horizontal_columns=('xl', 2, 10), style="width:100%" ) }}
+					</div>
+					<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" )}}
 				</form>
 			</div class="row">
 		</div class="container">
