diff --git a/templates/user/site-settings.html b/templates/user/site-settings.html
index 7e8ffbe..abe21cc 100644
--- a/templates/user/site-settings.html
+++ b/templates/user/site-settings.html
@@ -4,16 +4,8 @@
 <h1>Site Settings</h1>
 <a href="/dashboard">Dashboard</a>
 
-<div>
-    {{settings.enable-sign-up}}
-    {{settings.home-page}}
-    {% for page in pages %}
-    {{page}}
-    {% endfor %}
-</div>
-
 <h2>Sign-Up</h2>
-<form action="/site-settings/sign-up" method="post">
+<form action="/site-settings/update-sign-up" method="post">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
     <input type="checkbox" name="ENABLE-SIGN-UP"
 	   {% if settings.enable-sign-up == 1 %}
@@ -25,7 +17,7 @@
 </form>
 
 <h2>Home Page</h2>
-<form action="/site-settings/home-page" method="post">
+<form action="/site-settings/update-home-page" method="post">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
     <p>Currently set to: {{settings.home-page}}</p>
     <select required name="SET-HOME-PAGE">
@@ -37,44 +29,41 @@
     <input type="submit" value="Set Home Page">
 </form>
 
-<h1>Not Implemented Yet</h1>
-<hr>
-
-<h2>Navigation Menu</h2>
-<form action="/site-settings/nav-menu" method="post">
-    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    
-    {% for page in pages %}
-    <input type="checkbox" name="page[{{page}}]">
-    <label>{{page}}</label>
-    {% endfor %}
-
-    <input type="submit" value="Save Changes">
-</form>
-
 <h2>Site Name</h2>
-<form action="/site-settings/site-name" method="post">
+<form action="/site-settings/update-site-name" method="post">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-	<input required type="text" name="SITE-NAME" value="{{settings.title}}">
+    <input required type="text" name="SITE-NAME" value="{{settings.site-name}}">
     <input type="submit" value="Save Changes">
 </form>
 
 <h2>Site-Wide Code Snippet</h2>
-<form action="/site-settings/code-snippet" method="post">
+<form action="/site-settings/update-code-snippet" method="post">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input required type="text" name="CODE-SNIPPET" value="{{settings.code-snippet}}">
+    <input required type="text" name="CODE-SNIPPET" value="{{site-wide-snippet}}">
     <input type="submit" value="Save Changes">
 </form>
 
 <h2>Change Favicon</h2>
-<form action="/site-settings/update-favicon" method="post">
+<img alt="Favicon" src="/images/favicon.png">
+<form action="/site-settings/update-favicon" method="post" enctype="multipart/form-data">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
     <input required type="file" name="FAVICON-FILE">
     <input type="submit" value="Save Changes">
 </form>
 
 <h2>Site Logo</h2>
-<form action="/site-settings/site-logo" method="post">
+<img alt="Site Logo" src="/images/site-logo.png">
+<form action="/site-settings/update-enable-site-logo" method="post">
+    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+    <input type="checkbox" name="ENABLE-SITE-LOGO"
+	   {% if settings.enable-site-logo == 1 %}
+	   checked
+	   {% endif %}
+    >
+    <label>Enable Site Logo</label>
+    <input type="submit" value="Save Changes">
+</form>
+<form action="/site-settings/update-site-logo" method="post" enctype="multipart/form-data">
     <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
     <input required type="file" name="SITE-LOGO">
     <input type="submit" value="Save Changes">