diff --git a/app/styles/pages/login.scss b/app/styles/pages/login.scss
index 727c0d0..4d3aecc 100644
--- a/app/styles/pages/login.scss
+++ b/app/styles/pages/login.scss
@@ -5,4 +5,32 @@
   border-width: 0 1px;
   margin-top: $nav-bar-height;
   padding-top: $padding-m;
+  text-align: center;
+}
+
+.login-thumbnail {
+    height: 150px;
+    width: 150px;
+    margin-bottom: 10px;
+  }
+
+.login-input-group-addon {
+  background-color: $white;
+  width: 0%;
+}
+
+.login-input-group-addon:hover {
+  background-color: $black;
+  color: $white;
+}
+
+.login-form-control {
+  display: inline-block;
+  margin-bottom: 10px;
+  text-align: center;
+  width: 50%;
+}
+
+.password-margin-left {
+  margin-left: 64px;
 }
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index 5756bfc..7b15b22 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -1,19 +1,27 @@
 <div class="container login-form">
-  <form class="form-inline">
-    {{input class="form-control email"
+  <img src="" alt="This image should load when the e-mail field is filled" class="login-thumbnail img-thumbnail">
+  <form class="form-group has-warning has-feedback">
+    {{input class="login-form-control form-control email"
             data-auto-id="login-email"
             insert-newline="login"
             placeholder="Email"
+            aria-describedby="login-email"
             type="email"
             value=email}}
-
-    {{input class="form-control password"
+ <!--<span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+ <span id="login-email" class="sr-only">(error)</span>-->
+ <div class="form-group">
+    {{input class="password-margin-left login-form-control form-control  password"
             data-auto-id="login-password"
             insert-newline="login"
             placeholder="Password"
             type="password"
             value=password}}
 
-    <button {{action 'login'}} type="submit" class="btn btn-default submit">Login</button>
+<div class="btn btn-primary btn-md">
+  <div {{action 'login'}} type="submit">Login</div>
+</div>
+  </div>
+
   </form>
 </div>