diff --git a/public/css/app.less b/public/css/app.less
index 26f652e5e9..dc4aac38f5 100644
--- a/public/css/app.less
+++ b/public/css/app.less
@@ -6,46 +6,3 @@ body {
   padding-top: 60px;
 }
 
-.btn-label {
-  position: relative;
-  left: -12px;
-  display: inline-block;
-  padding: 6px 12px;
-  background: rgba(0, 0, 0, 0.15);
-  border-radius: 3px 0 0 3px;
-}
-
-.btn-labeled {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.main {
-  max-width: 320px;
-  margin: 0 auto;
-}
-.login-or {
-  position: relative;
-  font-size: 18px;
-  color: #aaa;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-.span-or {
-  display: block;
-  position: absolute;
-  left: 50%;
-  top: -2px;
-  margin-left: -25px;
-  background-color: #fff;
-  width: 50px;
-  text-align: center;
-}
-.hr-or {
-  background-color: #cdcdcd;
-  height: 1px;
-  margin-top: 0px !important;
-  margin-bottom: 0px !important;
-}
diff --git a/public/css/ios7.less b/public/css/ios7.less
index 1aa04a809f..ea369b6768 100644
--- a/public/css/ios7.less
+++ b/public/css/ios7.less
@@ -53,12 +53,13 @@ body {
     }
   }
 }
+
+
 // Buttons ====================================================================
 .btn {
   font-weight: 300;
-  margin: 0 10px 10px 0;
   transition: all 0.15s;
-
+  margin: 0 10px 10px 0;
   &:active,
   .active {
     box-shadow: none;
@@ -66,27 +67,39 @@ body {
 }
 
 .btn-default {
-  background: #bbbbbb;
-  border-color: #bbbbbb;
-  color: white; }
-.btn-default .caret {
-  border-top-color: white; }
-.btn-default:hover, .btn-default.active {
-  background: transparent;
-  color: #aaaaaa;
-  border-color: #bbbbbb; }
-.btn-default:hover .caret, .btn-default.active .caret {
-  border-top-color: #bbbbbb; }
+  background: #bbb;
+  border-color: #bbb;
+  color: #fff;
+
+  &:hover,
+  &.active {
+    background: transparent;
+    color: #aaa;
+    border-color: #bbb;
+  }
+}
 
 .btn-primary {
   background: #007aff;
-  border-color: #007aff; }
-.btn-primary:hover, .btn-primary.active {
-  background: transparent;
-  color: #007aff;
-  border-color: #007aff; }
-.btn-primary:hover .caret, .btn-primary.active .caret {
-  border-top-color: #007aff; }
+  border-color: #007aff;
+
+  &:hover,
+  &.active {
+    background: transparent;
+    color: #007aff;
+    border-color: #007aff;
+  }
+}
+
+.facebook {
+  background-color: #335397;
+  border-color: #335397;
+  &:focus,
+  &:hover {
+    background-color: transparent;
+    color: #335397;
+  }
+}
 
 // Panel ======================================================================
 .panel {
@@ -140,4 +153,76 @@ label {
 // Params: text-color; border-color; background-color
 .has-error {
   .form-control-validation(#d9534f; #d9534f; #d9534f);
-}
\ No newline at end of file
+}
+
+// Misc ===================================================================
+.login-container {
+  background-color: rgba(255, 255, 255, 0.95);
+  border-radius: 40px;
+  box-shadow: 0 0 50px rgba(0, 0, 0, 0.2);
+  padding: 30px;
+  width: 380px;
+  height: 390px;
+  text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -190px 0 15px -190px;
+  opacity: 0;
+  transition: all 0.75s 0.375s;
+
+  &.active {
+    opacity: 1;
+  }
+
+  .form-group {
+    position: relative;
+    margin-bottom: 0;
+  }
+
+  .form-control {
+    height: 48px;
+    font-size: 15px;
+    box-shadow: none;
+    border-radius: 0;
+    border: 0;
+    border-bottom: 1px solid #d6d6d6;
+    padding-left: 0;
+    padding-right: 0;
+    background: transparent;
+  }
+
+  .form-options {
+    margin: 20px 0 30px;
+
+    .checkbox {
+      display: inline-block;
+    }
+  }
+
+  button[type="submit"] {
+    position: absolute;
+    top: 10px;
+    right: 0;
+    opacity: 0.5;
+    font-family: "FontAwesome";
+    background: transparent;
+    color: #888;
+    border: 2px solid #888;
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    padding-left: 7px;
+    line-height: 24px;
+
+    &:hover {
+      opacity: 1;
+    }
+
+    [class^="fa-"],
+    [class*="fa-"] {
+      margin-right: 0;
+    }
+  }
+
+}
diff --git a/public/js/main.js b/public/js/main.js
new file mode 100644
index 0000000000..7c5d58bec2
--- /dev/null
+++ b/public/js/main.js
@@ -0,0 +1,3 @@
+$(window).load(function() {
+  return $(".login-container").addClass("active");
+});
\ No newline at end of file
diff --git a/views/login.jade b/views/login.jade
index 59803dbd03..3c8057751c 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -1,15 +1,26 @@
 extends layout
 
 block content
-  .main
-    h3
-      | Please Login, or 
-      a(href='/signup') Sign Up
+  .login-container
+    h3.text-center Project name
+    form(method='POST')
+      .form-group
+        input.form-control(type='text', name='usernameOrEmail', id='usernameOrEmail', placeholder='Username or Email', autofocus='')
+      .form-group
+        input.form-control(type='password', name='password', id='password', placeholder='Password')
+        button(type='submit')
+          i.fa.fa-chevron-right
+      .form-options.clearfix
+        a.pull-right(href='#') Forgot password?
+        .text-left
+          label.checkbox
+            input(type='checkbox')
+            span Remember me
     .row
       .col-xs-6.col-sm-6.col-md-6
-        a.btn.btn-primary.btn-block(href='/auth/facebook')
+        a.btn.btn-primary.btn-block.facebook(href='/auth/facebook')
           i.fa.fa-facebook
-          |   Facebook
+          | Facebook
       .col-xs-6.col-sm-6.col-md-6
         a.btn.btn-danger.btn-block(href='/auth/google')
           i.fa.fa-google-plus
@@ -23,19 +34,9 @@ block content
         a.btn.btn-default.btn-block(href='/auth/github')
           i.fa.fa-github
           |   GitHub
-    .login-or
-      hr.hr-or
-      span.span-or or
-    form(role='form', method='POST')
-      .form-group
-        label(for='email') Email
-        input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus='')
-      .form-group
-        a.pull-right(href='#') Forgot password?
-        label(for='password') Password
-        input.form-control(type='password', name='password', id='password', placeholder='Password')
-      .form-group
-        button.btn.btn.btn-success(type='submit') Log In
+    p Don't have an account yet?
+      a(href='signup1.html')  Sign up now
+
 
     if messages.length
       .alert.alert-danger