diff --git a/app/assets/stylesheets/boilerplate/main.css b/app/assets/stylesheets/boilerplate/main.css
index 375e7d2..c5e0335 100644
--- a/app/assets/stylesheets/boilerplate/main.css
+++ b/app/assets/stylesheets/boilerplate/main.css
@@ -93,6 +93,10 @@ textarea {
    Author's custom styles
    ========================================================================== */
 
+.margin-left-none{
+  margin-left: 0 !important;
+}
+
 /* ==========================================================================
    Helper classes
    ========================================================================== */
diff --git a/app/assets/stylesheets/form_with_tooltip.css b/app/assets/stylesheets/form_with_tooltip.css
new file mode 100644
index 0000000..7b48de3
--- /dev/null
+++ b/app/assets/stylesheets/form_with_tooltip.css
@@ -0,0 +1,38 @@
+.form-table {
+  margin: 0 !important;
+  background: #fff;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.form-row {
+  float: left;
+  width: 100%;
+  border-bottom: 1px solid #f2f2f2;
+  border-top: 1px solid #e3e3e3;
+  overflow: hidden;
+  display: inline-flex;
+}
+
+.field-container {
+  position: relative;
+  float: left;
+  width: 653px;
+  padding: 20px;
+}
+
+.help-container {
+  float: left;
+  width: 400px;
+  margin: 0 0 -20000px 0;
+  padding: 20px 20px 20000px 20px;
+  background: #f5f5f5;
+  border-left: 1px solid #e3e3e3;
+  border-right: 1px solid #e3e3e3;
+}
+
+.text-field {
+  width: 95% !important;
+  margin: 0;
+  background: #f9f9f9;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/sign_in.css b/app/assets/stylesheets/sign_in.css
deleted file mode 100644
index 3d40a87..0000000
--- a/app/assets/stylesheets/sign_in.css
+++ /dev/null
@@ -1,47 +0,0 @@
-.form-table {
-  margin: 0 !important;
-  background: #fff;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-}
-
-.margin-left-none{
-  margin-left: 0 !important;
-}
-
-.field {
-  float: left;
-  width: 100%;
-  border-bottom: 1px solid #f2f2f2;
-  border-top: 1px solid #e3e3e3;
-  overflow: hidden;
-  display: inline-flex;
-}
-
-.user-details {
-  position: relative;
-  float: left;
-  width: 653px;
-  padding: 20px;
-}
-
-.help {
-  float: left;
-  width: 400px;
-  margin: 0 0 -20000px 0;
-  padding: 20px 20px 20000px 20px;
-  background: #f5f5f5;
-  border-left: 1px solid #e3e3e3;
-  border-right: 1px solid #e3e3e3;
-}
-
-.label2 {
-  width: 95% !important;
-  height: 50px;
-  margin: 0;
-  padding: 10px;
-  color: #555;
-  font-size: 15px;
-  background: #f9f9f9;
-  border: 1px solid #dfdfdf;
-}
\ No newline at end of file
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index a364931..21e0161 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -7,46 +7,48 @@
 
   <div class="row margin-left-none">
     <div class="form-table span9">
-      <div class="field">
-        <div class="user-details"><%= f.label :name, class: 'control-label' %><br />
-          <%= f.text_field :name, :autofocus => true, class: 'label2' %></div>
-        <div class="help">
+      <div class="form-row">
+        <div class="field-container">
+          <%= f.label :name, class: 'control-label' %><br />
+          <%= f.text_field :name, :autofocus => true, class: 'text-field' %>
+        </div>
+        <div class="help-container">
           <p>
             Your full name!
           </p>
         </div>
       </div>
 
-      <div class="field">
-        <div class="user-details">
+      <div class="form-row">
+        <div class="field-container">
           <%= f.label :email, class: 'control-label' %><br />
-          <%= f.email_field :email, class: 'label2' %>
+          <%= f.email_field :email, class: 'text-field' %>
         </div>
-        <div class="help">
+        <div class="help-container">
           <p>
             Your email is the form of communication we have with you, so make sure you typed it correctly!
           </p>
         </div>
       </div>
 
-      <div class="field">
-        <div class="user-details">
+      <div class="form-row">
+        <div class="field-container">
           <%= f.label :password, class: 'control-label' %><br />
-          <%= f.password_field :password, class: 'label2' %>
+          <%= f.password_field :password, class: 'text-field' %>
         </div>
-        <div class="help">
+        <div class="help-container">
           <p>
             Your password must be at least 8 characters. Strong passwords contain characters in upper and lowercase, numbers and symbols.
           </p>
         </div>
       </div>
 
-      <div class="field">
-        <div class="user-details">
+      <div class="form-row">
+        <div class="field-container">
           <%= f.label :password_confirmation, class: 'control-label' %><br />
-          <%= f.password_field :password_confirmation, class: 'label2' %>
+          <%= f.password_field :password_confirmation, class: 'text-field' %>
         </div>
-        <div class="help">
+        <div class="help-container">
           <p>
             Confirm your password!
           </p>
--
libgit2 0.21.2