diff --git a/bookstore/src/main/resources/templates/bookadd.html b/bookstore/src/main/resources/templates/bookadd.html
index e987822..dba93b6 100644
--- a/bookstore/src/main/resources/templates/bookadd.html
+++ b/bookstore/src/main/resources/templates/bookadd.html
@@ -184,12 +184,10 @@
 
     	<br>
 
-    	<form action="#" th:action="@{__${listpage}__}" method="get">
-    		<button class="btn btn-success" type="submit"
-    		th:text="${#messages.msgOrNull('button.page.list.return')} ?: 'button.page.list.return'">
-    		button.page.list.return
-    		</button>
-    	</form>
+    	<a class="btn btn-success" th:href="@{../__${listpage}__}"
+		th:text="${#messages.msgOrNull('button.page.list.return')} ?: 'button.page.list.return'">
+		button.page.list.return
+		</a>
 
     </div>
 </body>
diff --git a/bookstore/src/main/resources/templates/bookedit.html b/bookstore/src/main/resources/templates/bookedit.html
index f27c4ca..6ac24c2 100644
--- a/bookstore/src/main/resources/templates/bookedit.html
+++ b/bookstore/src/main/resources/templates/bookedit.html
@@ -188,12 +188,10 @@
 
     	<br>
 
-    	<form action="#" th:action="@{../__${listpage}__}" method="get">
-    		<button class="btn btn-success" type="submit"
-    		th:text="${#messages.msgOrNull('button.page.list.return')} ?: 'button.page.list.return'">
-    		button.page.list.return
-    		</button>
-    	</form>
+    	<a class="btn btn-success" th:href="@{../__${listpage}__}"
+		th:text="${#messages.msgOrNull('button.page.list.return')} ?: 'button.page.list.return'">
+		button.page.list.return
+		</a>
 
     </div>
 </body>
diff --git a/bookstore/src/main/resources/templates/booklist.html b/bookstore/src/main/resources/templates/booklist.html
index 1de8084..ad22436 100644
--- a/bookstore/src/main/resources/templates/booklist.html
+++ b/bookstore/src/main/resources/templates/booklist.html
@@ -93,9 +93,6 @@
 
 			<tr style="background-color: #FFF !important;">
 				<td>
-					<!-- We could use button + <form> here to have uniform styling for all buttons (CSS),
-					and maybe other benefits but since we don't submit any data here but use this element
-					only to access a href link, we keep this structure simple. Change if needed. -->
 					<a class="btn btn-info" th:href="@{__${apirefpage}__}"
 					th:text="${#messages.msgOrNull('button.page.apiref')} ?: 'button.page.apiref'">
 					button.page.apiref