diff --git a/templates/customerIndex_FreelancerListing.html b/templates/customerIndex_FreelancerListing.html
index 3cefb14..ec4d1d1 100644
--- a/templates/customerIndex_FreelancerListing.html
+++ b/templates/customerIndex_FreelancerListing.html
@@ -29,11 +29,18 @@
         </tr>
         {{#freelancerProfiles}}
             <tr>
-                <th><a href="/customer/{{name}}/{{id}}">{{name}}</a></th>
+                <th>
+                    <form action="/customer/{{name}}" method="post">
+                        <button type="submit" name="freelancerID" value="{{id}}" class="button">{{name}}</button>
+                    </form>
+                </th>
                 <th>{{basicinformation}}</th>
                 <th>{{commissionsclosed}}</th>
             </tr>
         {{/freelancerProfiles}}
     </table>
 </body>
-</html>
\ No newline at end of file
+</html>
+
+
+
diff --git a/templates/customer_FreelancerListing.html b/templates/customer_FreelancerListing.html
index e7df187..1e4b338 100644
--- a/templates/customer_FreelancerListing.html
+++ b/templates/customer_FreelancerListing.html
@@ -27,15 +27,25 @@
     <div>Detailed Profile:</div>
     <div>{{freelancergeneralinformation}}</div>
     <br>
-    <a href="/">Return to freelancer selection</a>
+    <form action="/" method="post">
+        <button type="submit" class="button">Return to freelancer selection</button>
+    </form>
     <br>
     <table>
         {{#templates}}
             <tr>
-                <th><a href="/customer/{{freelancername}}/template/{{name}}/{{id}}">{{name}}</a></th>
+                <th>                    
+                    <form action="/customer/{{freelancername}}/template/{{name}}" method="post">
+                        <button type="submit" name="templateID" value="{{id}}" class="button">{{name}}</button>
+                    </form>
+                </th>
                 <th>{{content}}</th>
             </tr>
         {{/templates}}
     </table>
 </body>
-</html>
\ No newline at end of file
+</html>
+
+
+
+                    
\ No newline at end of file
diff --git a/templates/customer_FreelancerListing_NOTFOUND.html b/templates/customer_FreelancerListing_NOTFOUND.html
index a55fa7d..3d1a037 100644
--- a/templates/customer_FreelancerListing_NOTFOUND.html
+++ b/templates/customer_FreelancerListing_NOTFOUND.html
@@ -21,6 +21,8 @@
 </head>
 <body>
     <h1>Freelancer: {{selectedfreelancername}} Could not be found!</h1>
-    <h2><a href="/">Return to freelancer selection</a></h2>
+    <form action="/" method="post">
+        <button type="submit" class="button">Return to freelancer selection</button>
+    </form>
 </body>
 </html>
\ No newline at end of file
