diff --git a/app/views/users/_inputs.html.erb b/app/views/users/_inputs.html.erb
index c831ce3..307f140 100644
--- a/app/views/users/_inputs.html.erb
+++ b/app/views/users/_inputs.html.erb
@@ -1,6 +1,6 @@
-<fieldset class="inputs">
-  <%= form.string :email %>
-  <%= form.password :password %>
-  <%= form.password :password_confirmation %>
-</fieldset>
+<% form.inputs do %>
+  <%= form.input :email %>
+  <%= form.input :password %>
+  <%= form.input :password_confirmation %>
+<% end %>
 
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index ee6bb0e..be7f1dc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,8 +1,10 @@
 <h2>Sign up</h2>
 
-<% form.inputs do %>
-  <%= form.input :email %>
-  <%= form.input :password %>
-  <%= form.input :password_confirmation %>
+<% semantic_form_for @user do |form| %>
+  <%= form.error_messages %>
+  <%= render :partial => "/users/inputs", :locals => { :form => form } %>
+  <% form.buttons do %>
+    <%= form.commit_button "Sign up" %>
+  <% end %>
 <% end %>
 
--
libgit2 0.21.2