diff --git a/Web/templates/blog/settings.html.ep b/Web/templates/blog/settings.html.ep
index 58eba1f..1ce6ba4 100644
--- a/Web/templates/blog/settings.html.ep
+++ b/Web/templates/blog/settings.html.ep
@@ -21,18 +21,28 @@
 
 <form style="margin-top: 1.5em" method="POST" action="<%= $c->url_for( 'do_blog_settings' ) %>">
     <div class="mt-3 mb-3">
-        <label for="configTitle" class="col-sm-12 col-form-label"><strong>Title</strong> - The name of your blog, like <em>Sherry's Book Review</em></label>
-        <input type="text" class="form-control" id="configTitle" name="configTitle" value="<%= $c->stash->{form_title} %>">
+        <label for="configTitle" class="col-sm-2 col-form-label">Title</label>
+        <input type="text" class="form-control" id="configTitle" name="configTitle" value="<%= $c->stash->{form}->{title} %>">
     </div>
     
     <div class="mt-3 mb-3">
-        <label for="configDesc" class="col-sm-12 col-form-label"><strong>Description</strong> - A short description, like <em>The freshest takes on the newest books with Sherry</em>.</label>
-        <input type="text" class="form-control" id="configDesc" name="configDesc" value="<%= $c->stash->{form_desc} %>">
+        <label for="configDesc" class="col-sm-2 col-form-label">Description</label>
+        <input type="text" class="form-control" id="configDesc" name="configDesc" value="<%= $c->stash->{form}->{desc} %>">
     </div>
 
     <div class="mt-3 mb-3">
-        <label for="configEmail" class="col-sm-12 col-form-label"><strong>Email</strong> - An email for your blog readers to reach you at.  Leave blank for none.</label>
-        <input type="text" class="form-control" id="configEmail" name="configEmail" value="<%= $c->stash->{form_email} %>">
+        <label for="configEmail" class="col-sm-2 col-form-label">Twitter Username</label>
+        <input type="text" class="form-control" id="configTwitterUsername" name="configTwitterUsername" value="<%= $c->stash->{form}->{twitter_username} %>">
+    </div>
+    
+    <div class="mt-3 mb-3">
+        <label for="configEmail" class="col-sm-2 col-form-label">Github Username</label>
+        <input type="text" class="form-control" id="configGithubUsername" name="configGithubUsername" value="<%= $c->stash->{form}->{github_username} %>">
+    </div>
+    
+    <div class="mt-3 mb-3">
+        <label for="configEmail" class="col-sm-2 col-form-label">Email</label>
+        <input type="text" class="form-control" id="configEmail" name="configEmail" value="<%= $c->stash->{form}->{email} %>">
     </div>
 
     <div class="mb-3">
diff --git a/Web/templates/dashboard/blog_settings.html.ep b/Web/templates/dashboard/blog_settings.html.ep
index d43d0f0..fc3b194 100644
--- a/Web/templates/dashboard/blog_settings.html.ep
+++ b/Web/templates/dashboard/blog_settings.html.ep
@@ -15,11 +15,6 @@
         <input type="text" class="form-control" id="configDesc" name="configDesc" value="<%= $c->stash->{form}->{desc} %>">
     </div>
 
-    <div class="mt-3 mb-3">
-        <label for="configEmail" class="col-sm-2 col-form-label">Email</label>
-        <input type="text" class="form-control" id="configEmail" name="configEmail" value="<%= $c->stash->{form}->{email} %>">
-    </div>
-    
     <div class="mt-3 mb-3">
         <label for="configEmail" class="col-sm-2 col-form-label">Twitter Username</label>
         <input type="text" class="form-control" id="configTwitterUsername" name="configTwitterUsername" value="<%= $c->stash->{form}->{twitter_username} %>">
@@ -31,10 +26,10 @@
     </div>
     
     <div class="mt-3 mb-3">
-        <label for="configEmail" class="col-sm-2 col-form-label">Theme</label>
-        <input type="text" class="form-control" id="configTheme" name="configTheme" value="<%= $c->stash->{form}->{theme} %>">
+        <label for="configEmail" class="col-sm-2 col-form-label">Email</label>
+        <input type="text" class="form-control" id="configEmail" name="configEmail" value="<%= $c->stash->{form}->{email} %>">
     </div>
-
+    
     <div class="mb-3">
         <input type="submit" class="btn btn-primary btn-sm float-end" width="100%" value="Update Settings">
     </div>