Index: Prototype Application/Paw5/src/main/resources/templates/aboutUs.html
===================================================================
--- Prototype Application/Paw5/src/main/resources/templates/aboutUs.html	(revision 4103eaa6cd6e6a73eec104a9fc23845ff4d110b9)
+++ Prototype Application/Paw5/src/main/resources/templates/aboutUs.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
@@ -40,5 +40,5 @@
     <h5 class="text-center text-danger">
         You successfully logged in
-        <th:block  th:text="${session.user.getId()}"></th:block>
+        <th:block  th:text="${session.user?.getId()}"></th:block>
     </h5>
 </div>
Index: Prototype Application/Paw5/src/main/resources/templates/home.html
===================================================================
--- Prototype Application/Paw5/src/main/resources/templates/home.html	(revision 4103eaa6cd6e6a73eec104a9fc23845ff4d110b9)
+++ Prototype Application/Paw5/src/main/resources/templates/home.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
@@ -43,8 +43,12 @@
   <h1>Welcome to Paw 5</h1>
   <h3>Let's get started
-    <th:block  th:text="${session.user.getName()}"></th:block>
+    <th:block  th:text="${session.user?.getName()}"></th:block>
   </h3>
 </div>
-
+<div>
+  <form method="get" th:action="@{'/adoption-posts'}">
+    <button id="submit" type="submit">View Adoption posts</button>
+  </form>
+</div>
 </body>
 </html>
Index: Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html
===================================================================
--- Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
+++ Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<head>
+    <meta charset="UTF-8">
+    <title>Adoption Posts</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
+</head>
+<body>
+<header>
+    <nav class="navbar navbar-expand-md navbar-dark bg-dark">
+        <div class="container">
+            <a class="navbar-brand" href="/home">Paw 5</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                    aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+
+            <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+                <ul class="navbar-nav m-auto">
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/home/aboutUs">About us</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/login">Login</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/register">Register</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</header>
+<table>
+    <tr>
+        <th>Post ID</th>
+        <th>Pet Name</th>
+        <th>Species</th>
+    </tr>
+    <tr th:each = "post : ${session.posts}">
+        <td th:text = "${post.getId()}"></td>
+        <td th:each = "pet : ${session.pets}" th:if="${post.getPetId()==pet.getId()}" th:text = "${pet.getName()}"></td>
+        <td th:each = "pet : ${session.pets}" th:if="${post.getPetId()==pet.getId()}" th:text = "${pet.getSpecies()}"></td>
+        <td>
+            <form th:action="@{'/pet-details-{id}' (id=${post.getId()})}"
+                  th:method="GET">
+                <button type="submit"
+                        class="btn">
+                        View Details
+                </button>
+            </form>
+
+        </td>
+    </tr>
+</table>
+</body>
+</html>
Index: Prototype Application/Paw5/src/main/resources/templates/pet-details.html
===================================================================
--- Prototype Application/Paw5/src/main/resources/templates/pet-details.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
+++ Prototype Application/Paw5/src/main/resources/templates/pet-details.html	(revision eac569a88d05dfc7d2636393d7333806a10091cb)
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+</head>
+<body>
+<header>
+    <nav class="navbar navbar-expand-md navbar-dark bg-dark">
+        <div class="container">
+            <a class="navbar-brand" href="/home">Paw 5</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                    aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+
+            <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+                <ul class="navbar-nav m-auto">
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/home/aboutUs">About us</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/login">Login</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/register">Register</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</header>
+<table>
+    <tr>
+        <th>Post ID</th>
+        <td th:text = "${session.post.getId()}"></td>
+    <tr>
+        <th>Pet Name</th>
+        <td th:text = "${session.pet.getName()}"></td>
+    </tr>
+    <tr>
+        <th>Species</th>
+        <td th:text = "${session.pet.getSpecies()}"></td>
+    </tr>
+    <tr>
+        <th>Breed</th>
+        <td th:text = "${session.pet.getBreed()}"></td>
+    </tr>
+    <tr>
+        <th>Gender</th>
+        <td th:text = "${session.pet.getGender()}"></td>
+    </tr>
+    <tr>
+        <th>Age Group</th>
+        <td th:text = "${session.pet.getAgeGroup}"></td>
+    </tr>
+    <tr>
+        <th>Size</th>
+        <td th:text = "${session.pet.getSize()}"></td>
+    </tr>
+</table>
+<form method="POST" th:action="@{'/submit-adopton-{id}' (id=${session.pet.getId()})}" th:disabled="${session.disableAdoption}">
+    <button id="submit" type="submit">Adopt</button>
+</form>
+
+</body>
+</html>
