diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index cabd6303..e67b6e69 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -92,8 +92,6 @@ body,
 .login input[type="submit"]{
     width:84px;
     margin-top: 16px;
-    margin-left: 61px;
-    margin-right: 35px;
     font-family: din-regular;
     text-transform: uppercase;
 }
@@ -227,23 +225,16 @@ input[type="submit"]:active {
 }
 
 .login{
-    width: 322px;
+    width: 200px;
     height: 308px;
     box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.23), 0px 3px 3px rgba(0, 0, 0, 0.16);
-    margin-left:-166px;
+    margin-left:-100px;
     margin-top:-158px;
-    padding-left: 35px;
     font-family: din-medium;
     font-size: 18px;
     color: #424242;
 }
 
-.login input[type="checkbox"] {
-    border: 1px #424242;
-    top: 250px;
-    float: left;
-}
-
 .new_user{
     height: 412px;
     margin-left:-166px;
@@ -258,8 +249,7 @@ input[type="submit"]:active {
 
 .edit_user {
     width: 300px;
-    height:531px;
-    top: 136px;
+    margin-top: -282px;
     margin-left: -166px;
     box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.23), 0px 3px 3px rgba(0, 0, 0, 0.16);
     text-transform: uppercase;
@@ -309,13 +299,6 @@ input[type="submit"]:active {
     margin-top: 16px;
 }
 
-.forgotPasswordText {
-    font-family: din-medium;
-    font-size: 12px;
-    color:#757575;
-    margin-left: 35px;
-}
-
 .name {
     font-size: 24px;
     text-align: center;
@@ -370,7 +353,6 @@ input[type="submit"]:active {
     font-size: 14px;
     text-align: left;
     padding: 11px 0px 0px 10px;
-    margin-left: 61px;
 }
 
 .login input[type="email"] {
@@ -745,11 +727,18 @@ li.accountInvite span {
     box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 .accountSubmit {
-    margin-left: 35px;
     float:left;
 }
+.loginAnywhere .accountSubmit {
+    margin-left: 35px;
+}
 .accountRememberMe {
     float:right;
+}
+.login .accountRememberMe {
+    margin-top: 10px;
+}
+.loginAnywhere .accountRememberMe {
     margin-right: 35px;
 }
 #user_remember_me {
@@ -761,12 +750,16 @@ label[for="user_remember_me"] {
     float: right;
     font-size: 12px;
     color: #424242;
-    margin-left: 24px;
 }
 .accountForgotPass {
-    margin: 8px 0 0 35px;
     font-size: 12px;
 }
+.loginAnywhere .accountForgotPass {
+    margin: 8px 0 0 35px;
+}
+.login .accountForgotPass {
+    margin: 8px 0 0 0;
+}
 .accountForgotPass a {
     color: #757575;
 }
@@ -2257,4 +2250,4 @@ float: left;
     background-position: 16px 8px;
     -webkit-transform-origin: left center;
     transform-origin: left center;
-}   
+}   
diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb
index 5fe43665..0cee5c7f 100644
--- a/app/views/layouts/_account.html.erb
+++ b/app/views/layouts/_account.html.erb
@@ -38,14 +38,18 @@
         </div>
         <div class="accountSubmit"><%= f.submit "SIGN IN" %></div>
         <% if devise_mapping.rememberable? -%>
-        <div class="accountRememberMe"><%= f.check_box :remember_me %> <%= f.label :remember_me, "Stay signed in" %><div class="clearfloat"></div></div>
+        <div class="accountRememberMe">
+          <%= f.label :remember_me, "Stay signed in" %>
+          <%= f.check_box :remember_me %>
+          <div class="clearfloat"></div>
+        </div>
         <% end -%>
         <div class="clearfloat"></div>
+        <div class="accountForgotPass">
+          <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+            <%= link_to "Forgot password?", new_password_path(resource_name), 
+              :data => { :bypass => 'true'} %>
+          <% end -%>
+        </div>
   <% end %>
-  <div class="accountForgotPass">
-    <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-      <%= link_to "Forgot password?", new_password_path(resource_name), 
-        :data => { :bypass => 'true'} %>
-    <% end -%>
-  </div>
 <% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index c85dc299..5eee44f1 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -6,18 +6,18 @@
   
 <% content_for :title, @user.name + "'s Settings | Metamaps" %> 
 <div id="yield">
-<%= formula_form_for @user, url: user_url, :html =>{ :class => "edit_user centerGreyForm"} do |form| %>
+<%= form_for @user, url: user_url, :html =>{ :class => "edit_user centerGreyForm"} do |form| %>
   <h3>Edit Account</h3>
   <% if @user.image %><%= image_tag @user.image.url(:round), :size => "120x120" %><% end %>
   <div class="name"> <%= @user.name %> </div>
   <div><%= form.label :email, "Email:", :class => "firstFieldText" %>
-  <%= form.input :email  %></div>
+  <%= form.email_field :email  %></div>
   <div><%= form.label :password, "Current Password:", :class => "firstFieldText" %>
-  <%= form.input :password, :autocomplete => :off%></div>
+  <%= form.password_field :password, :autocomplete => :off%></div>
    <div><%= form.label :password, "New Password:", :class => "firstFieldText" %>
-  <%= form.input :password, :autocomplete => :off%></div>
-   <div><%= form.label :password, "Confirm New Password:", :class => "firstFieldText" %>
-  <%= form.input :password, :autocomplete => :off%></div>
+  <%= form.password_field :password, :autocomplete => :off%></div>
+   <div><%= form.label :password_confirmation, "Confirm New Password:", :class => "firstFieldText" %>
+  <%= form.password_field :password_confirmation, :autocomplete => :off%></div>
   <%= form.submit "Update", class: "update" %>
 <% end %>
 </div>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index 0a13b435..0c28a9cb 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -6,22 +6,27 @@
   
   <div class="accountImage"></div>
   <div>
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email, :autofocus => true, :placeholder => "Email" %></div>
 
   <div>
-  <%= f.password_field :password %></div>
+  <%= f.password_field :password, :placeholder => "Password" %></div>
 
-  <div><%= f.submit "Sign in" %></div>
+  <div class="accountSubmit"><%= f.submit "Sign in" %></div>
   <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <div class="clearfloat"></div></div>
+    <div class="accountRememberMe">
+      <%= f.label :remember_me, "Stay signed in" %>
+      <%= f.check_box :remember_me %>
+      <div class="clearfloat"></div>
+    </div>
   <% end -%>
+  <div class="clearfloat"></div>
 
-  <br />
-  <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-    <%= link_to "Forgot your password?", new_password_path(resource_name), :class => "forgotPasswordText" , 
-        :data => { :bypass => 'true'}%><br />
-  <% end -%>
-  <br />
+  <div class="accountForgotPass">
+    <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+      <%= link_to "Forgot password?", new_password_path(resource_name), 
+          :data => { :bypass => 'true'}%><br />
+    <% end -%>
+  </div>
 <% end %>
 </div>