diff --git a/Java/Spring/activitypubbot/src/main/resources/templates/listbots.html b/Java/Spring/activitypubbot/src/main/resources/templates/listbots.html
index b0012ba..fba2e1a 100644
--- a/Java/Spring/activitypubbot/src/main/resources/templates/listbots.html
+++ b/Java/Spring/activitypubbot/src/main/resources/templates/listbots.html
@@ -17,9 +17,13 @@
     <ul th:if="${bots.empty}">
         <li>No Bots!</li>
     </ul>
-    <ul th:each="bot : ${bots}">
-        <li>Bot: <a th:href="@{/viewbot/} + ${bot.username}"><span th:text="${bot.username}">Bot</span></a></li>
-    </ul>
+    <th:block th:each="bot : ${bots}">
+        <span>Bot:</span>
+        <span><a th:href="@{/viewbot/} + ${bot.username}">[[${bot.username}]]</a></span>
+        <br>
+    </th:block>
+    <br>
+    <a href="/">HOME</a>
 </div>
 </body>
 </html>
diff --git a/Java/Spring/activitypubbot/src/main/resources/templates/makebot.html b/Java/Spring/activitypubbot/src/main/resources/templates/makebot.html
index 47dab56..4222fb4 100644
--- a/Java/Spring/activitypubbot/src/main/resources/templates/makebot.html
+++ b/Java/Spring/activitypubbot/src/main/resources/templates/makebot.html
@@ -42,6 +42,9 @@
  
         <button type="submit">Register</button>    
     </form>
+    <br>
+    <a href="/">HOME</a> |
+    <a href="/viewbot">Bot List</a>
 </div>
 </body>
 </html>
diff --git a/Java/Spring/activitypubbot/src/main/resources/templates/viewbot.html b/Java/Spring/activitypubbot/src/main/resources/templates/viewbot.html
index 0212242..e7c775c 100644
--- a/Java/Spring/activitypubbot/src/main/resources/templates/viewbot.html
+++ b/Java/Spring/activitypubbot/src/main/resources/templates/viewbot.html
@@ -8,6 +8,7 @@
         display: inline-block;
         width: 200px;
         text-align: left;
+        margin-bottom: 0.5em;
     }
 </style>
 </head>
@@ -15,10 +16,14 @@
 <div align="center">
     <h2>Bot:</h2>
     <span>Username:</span><span th:text="${bot.username}"></span><br/>
+    <span>Id:</span><span th:text="'@' + ${bot.username} + '@springbot.seth.id.au'"></span><br/>
     <span>Display Name:</span><span th:text="${bot.name}"></span><br/>
     <span>Description:</span><span th:text="${bot.summary}"></span><br/>
     <span>Published:</span><span th:text="${bot.published}"></span><br/>
     <span>Type:</span><span th:text="${bot.type}"></span><br/>
+    <br>
+    <a href="/">HOME</a> |
+    <a href="/viewbot">Bot List</a>
 </div>
 </body>
 </html>