diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 85942b5..99f0b93 100755
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -5,23 +5,15 @@
     <%= devise_error_messages! %>
   </div>
   <div style="float:right; width:45%; padding-left:30px; border-left:1px solid #e2e2e2;">
-    <%= form_for("user", :as => resource_name, :url => registration_path("user")) do |f| %>
-      <p>
-        Username: <br />
-        <%= f.text_field :username, :autocomplete => "off" %><br />
-      </p>
-      <p>
-        Email Address: <br />
-        <%= f.text_field :email, :autocomplete => "off" %><br />
-      </p>
-      <p>
-        Password:<br />
-        <%= f.password_field :password, :autocomplete => "off" %><br />
-      </p>
-      <p>
-        Confirm Password:<br />
-        <%= f.password_field :password_confirmation, :autocomplete => "off" %><br />
-      </p>
+      <%= form_for("user", :as => resource_name, :url => registration_path("user")) do |f| %>
+      <%= f.label :username %>
+      <%= f.text_field :username, :autocomplete => "off" %><br />
+      <%= f.label :email %>
+      <%= f.text_field :email, :autocomplete => "off" %><br />
+      <%= f.label :password %>
+      <%= f.password_field :password, :autocomplete => "off" %><br />
+      <%= f.label :password_confirmation %>
+      <%= f.password_field :password_confirmation, :autocomplete => "off" %><br />
       <p><%= f.submit "Sign up", :class=> 'btn btn-primary' %></p>
     <% end %>
   </div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 4de1bc8..860fc89 100755
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -24,8 +24,9 @@
   </div>
   <div style="float:right; width:45%; height:195px; padding-left:30px; border-left:1px solid #e2e2e2;">
     <%= form_for("user", :url => user_session_path) do |f| %>
-      <p><%= f.text_field :username , :value => "username" %></p>
-      <p><%= f.password_field :password, :value => "password" %></p>
+      <%= f.text_field :username , :value => "username" %>
+      <%= f.password_field :password, :value => "password" %>
+      <br/>
       <%= f.submit 'Sign in', :class =>'btn btn-primary' %>
     <% end %>
   </div>