diff --git a/app/templates/404.html b/app/templates/404.html
index 5cd25a06fbb5f9b73a6bdcebfff16bf75a04faf4..6d26798d54e282bc04a9ff9e6e0d26193415fee1 100644
--- a/app/templates/404.html
+++ b/app/templates/404.html
@@ -1,9 +1,7 @@
 {%- extends "base.html" %}
 
-{% block title %}Page Not Found{% endblock %}
+{% block title %}Page Not Found - ICS Inventory{% endblock %}
 
 {% block main %}
-  <div class="page-header">
-    <h1>Page Not Found</h1>
-  </div>
+  <h1>Page Not Found</h1>
 {%- endblock %}
diff --git a/app/templates/500.html b/app/templates/500.html
index f3956ba9886ad1b1f1ba2c6ffeb87a603879f929..8be15a0484667624c8e7f2d04e20a2de5204689e 100644
--- a/app/templates/500.html
+++ b/app/templates/500.html
@@ -1,9 +1,7 @@
 {%- extends "base.html" %}
 
-{% block title %}Internal Server Error{% endblock %}
+{% block title %}Internal Server Error - ICS Inventory{% endblock %}
 
 {% block main %}
-  <div class="page-header">
-    <h1>Internal Server Error</h1>
-  </div>
+  <h1>Internal Server Error</h1>
 {%- endblock %}
diff --git a/app/templates/qrcodes.html b/app/templates/qrcodes.html
index 9e5162978a5e7e4c63d5b6b2ec7026c6a014279c..3a0bbd1a8e136a06be883e814c4d3a3f2fe55974 100644
--- a/app/templates/qrcodes.html
+++ b/app/templates/qrcodes.html
@@ -19,5 +19,6 @@
     </div>
     {% endfor %}
   </div>
+  <hr class="separator">
   {% endfor %}
 {%- endblock %}
diff --git a/app/templates/users/login.html b/app/templates/users/login.html
index eb454f240b760dfe974ce8d4bbc2dfb195079f1d..60a6cc594811bf1e592cfb94e7de6022565fe4a4 100644
--- a/app/templates/users/login.html
+++ b/app/templates/users/login.html
@@ -4,14 +4,32 @@
 {% block title %}Login - ICS Inventory{% endblock %}
 
 {% block main %}
-  <div class="col-sm-offset-2 col-sm-3">
-    <h1>Login</h1>
+  <div class="col-sm-offset-2 col-sm-4">
+    <h2>Login</h2>
     <form action="" method="POST" role="form">
+      {% if form.errors %}
+        {% set class_ = "form-control is-invalid" %}
+      {% else %}
+        {% set class_ = "form-control" %}
+      {% endif %}
       {{ form.hidden_tag() }}
-      {{ wtf.form_field(form.username) }}
-      {{ wtf.form_field(form.password) }}
-      {{ wtf.form_field(form.remember_me) }}
-      {{ wtf.form_field(form.submit) }}
+      <div class="form-group">
+        {{ form.username.label() }}
+        {{ form.username(class=class_, required=True, placeholder="ESS username") }}
+        <div class="invalid-feedback">Invalid Username/Password.</div>
+      </div>
+      <div class="form-group">
+        {{ form.password.label() }}
+        {{ form.password(class=class_, required=True) }}
+        <div class="invalid-feedback">Invalid Username/Password.</div>
+      </div>
+      <div class="form-check">
+        <label class="form-check-label">
+          {{ form.remember_me(class="form-check-input") }}
+          Remember Me
+        </label>
+      </div>
+      <button type="submit" class="btn btn-primary">Submit</button>
     </form>
   </div>
 {% endblock %}
diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html
index ebffe0498370ce8496340656dc835889e16959bf..fc384b05d85d7584080fdad87ab619f466bf1539 100644
--- a/app/templates/users/profile.html
+++ b/app/templates/users/profile.html
@@ -4,9 +4,8 @@
 {% block title %}Profile - ICS Inventory{% endblock %}
 
 {% block main %}
-  <div class="page-header">
-    <h2>{{ user.username }}</h2>
-  </div>
+  <h2>{{ user.username }}</h2>
+
   <dl>
     <dt>Name</dt>
     <dd>{{user.name}}</dd>
@@ -19,5 +18,6 @@
     <dd>{{ token }}</dd>
     {% endif %}
   </dl>
-  <a class="btn btn-default" href="{{ url_for('users.get_token') }}" role="button">Generate Token</a>
+
+  <a class="btn btn-primary" href="{{ url_for('users.get_token') }}" role="button">Generate Token</a>
 {% endblock %}