diff --git a/static/styles.css b/static/styles.css
index 4c148c9..b1e9fc4 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -123,26 +123,6 @@ nav .links li:not(:last-child)::after, footer .links li:not(:last-child)::after
   font-size: 1em;
 }
 
-form {
-  margin: 1em auto;
-  width: fit-content;
-}
-form.login-form {
-  border: 1px solid darkblue;
-  padding: 0.7em;
-}
-form field {
-  padding: 4px;
-}
-form field .checkbox {
-  margin-left: auto;
-}
-form button {
-  border-radius: 0px;
-  width: 15em;
-  margin: 0 auto;
-}
-
 .profile-title {
   display: block;
   border-bottom: 1px solid grey;
@@ -323,4 +303,46 @@ span.error-message.center-message {
   display: table;
 }
 
+form {
+  background: white;
+  width: fit-content;
+  margin: 0 auto 0 auto;
+  padding: 1em;
+  border: grey 1px solid;
+  white-space: nowrap;
+}
+form label {
+  display: inline-block;
+  min-width: 10em;
+}
+form input {
+  border: #ccc 1px solid;
+  border-bottom: #ccc 2px solid;
+  padding: 3px;
+  margin-top: 10px;
+  font-size: 1em;
+  border-radius: 4px;
+}
+form input[type=submit] {
+  width: 100%;
+}
+
+.button {
+  background: #2ecc71;
+  width: 125px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  color: white;
+  border-radius: 4px;
+  border: #27ae60 1px solid;
+  float: left;
+  margin: 0 0 0 16px;
+  font-weight: 800;
+  font-size: 0.8em;
+}
+
+.button:hover {
+  background: #2CC06B;
+}
+
 /*# sourceMappingURL=styles.css.map */
diff --git a/static/styles.css.map b/static/styles.css.map
index d32f6c1..381f5ad 100644
--- a/static/styles.css.map
+++ b/static/styles.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AASJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;;AAKJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;;;AAMF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EAEE;EACA;EACA;;;AAMR;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAKN;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA","file":"styles.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AASJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;;AAKJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;;;AAMF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EAEE;EACA;EACA;;;AAMR;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAKN;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EAKE;EACA;EACA;EAEA;EACA;EACA;;AAVA;EACE;;;AAaN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;EACE","file":"styles.css"}
\ No newline at end of file
diff --git a/static/styles.scss b/static/styles.scss
index fccd770..7628592 100644
--- a/static/styles.scss
+++ b/static/styles.scss
@@ -145,30 +145,6 @@ nav, footer {
   font-size: 1em;
 }
 
-form {
-  margin: 1em auto;
-  width: fit-content;
-
-  &.login-form {
-    border: 1px solid darkblue;
-    padding: 0.7em;
-  }
-
-  field {
-    padding: 4px;
-
-    .checkbox {
-      margin-left: auto;
-    }
-  }
-
-  button {
-    border-radius: 0px;
-    width: 15em;
-    margin: 0 auto;
-  }
-}
-
 .profile-title {
   display: block;
   border-bottom: 1px solid grey;
@@ -380,3 +356,69 @@ span.error-message {
     display: table;
   }
 }
+
+form {
+  background: white;
+  width: fit-content;
+  margin: 0 auto 0 auto;
+  padding: 1em;
+  border: grey 1px solid;
+  white-space: nowrap;
+
+  label {
+    display: inline-block;
+    min-width: 10em;
+  }
+
+  input {
+    &[type="submit"] {
+      width: 100%;
+    }
+    //background: #ecf0f1;
+    border: #ccc 1px solid;
+    border-bottom: #ccc 2px solid;
+    padding: 3px;
+    //width: 100%;
+    margin-top: 10px;
+    font-size: 1em;
+    border-radius: 4px;
+  }
+}
+
+.button {
+  background: #2ecc71;
+  width: 125px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  color: white;
+  border-radius: 4px;
+  border: #27ae60 1px solid;
+
+  float: left;
+  margin: 0 0 0 16px;
+  font-weight: 800;
+  font-size: 0.8em;
+}
+
+.button:hover {
+  background: #2CC06B;
+}
+
+//.button {
+//  float: left;
+//  background: #3498db;
+//  width: 125px;
+//  padding-top: 5px;
+//  padding-bottom: 5px;
+//  color: white;
+//  border-radius: 4px;
+//  border: #2980b9 1px solid;
+//
+//  margin: 20px 0 20px 10px;
+//  font-weight: 800;
+//  font-size: 0.8em;
+//}
+//
+//.button:hover {
+//  background: #3594D2;
+//}
diff --git a/templates/macros.html b/templates/macros.html
index 69eb73e..f0212f9 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -1,14 +1,12 @@
 {% macro render_field(field) %}
-    <field>
-        <label>{{ field.label }}</label>
-        {{ field(**kwargs)|safe }}
-        {% if field.errors %}
-            <ul class=errors>
-                {% for error in field.errors %}
-                    <li>{{ error }}</li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-        <br>
-    </field>
+    {{ field.label }}
+    {{ field(**kwargs)|safe }}
+    {% if field.errors %}
+        <ul class=errors>
+            {% for error in field.errors %}
+                <li>{{ error }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+    <br>
 {% endmacro %}
diff --git a/templates/pages/auth/login.html b/templates/pages/auth/login.html
index 0fa247d..f1325ee 100644
--- a/templates/pages/auth/login.html
+++ b/templates/pages/auth/login.html
@@ -13,8 +13,7 @@
         {{ render_field(form.username) }}
         {{ render_field(form.password) }}
         {{ render_field(form.remember_me) }}
-            <p><input type=submit value=Login>
-
+        <input type=submit value=Login>
     </form>
     <p class="form-subtext">
         Don't have a login? <a href="{{ url_for('auth.signup') }}">Sign-up</a> instead!
diff --git a/templates/pages/auth/signup.html b/templates/pages/auth/signup.html
index 7f75778..776159a 100644
--- a/templates/pages/auth/signup.html
+++ b/templates/pages/auth/signup.html
@@ -10,7 +10,7 @@
             {{ render_field(form.confirm) }}
             {{ render_field(form.accept_tos) }}
         </dl>
-        <p><input type=submit value=Register>
+        <input type=submit value=Register>
     </form>
 
     <p class="form-subtext">