2 files changed, 24 insertions, 11 deletions
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index b2d5675..53b37b8 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -45,7 +45,7 @@
         <td><%= user.user_name %></td>
         <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
-        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= button_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 03041d9..1445a0d 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -26,24 +26,37 @@
 <%= form_for @user do |f| %>
 	<%= render "common/error_messages", :target => @user %>
 	<div class="field">
-		<%= f.label :name %><br>
-		<%= f.text_field :name %>
+		<%= f.label :user_name %>
+		<span class="help-block">
+		  This is the name you will use to log in.
+		  It may consist of letters, numbers, <kbd>_</kbd>, and <kbd>-</kbd>.
+		</span>
+		<br>
+		<%= f.text_field :user_name %>
 	</div>
 	<div class="field">
-		<%= f.label :email %><br>
-		<%= f.text_field(:email, type: "email") %>
+		<%= f.label :password %>
+		<span class="help-block">
+		  Must be at least 6 characters long.
+		</span>
+		<br>
+		<%= f.password_field(:password, required: :required, minlength: 6) %>
 	</div>
 	<div class="field">
-		<%= f.label :user_name %><br>
-		<%= f.text_field :user_name %>
+		<%= f.label(:password_confirmation, "Confirm Password") %><br>
+		<%= f.password_field(:password_confirmation, required: :required, minlength: 6) %>
 	</div>
 	<div class="field">
-		<%= f.label :password %><br>
-		<%= f.password_field :password %>
+		<%= f.label :name %>
+		<span class="help-block">
+		  A display name; perhaps your real name, or perhaps an alias.
+		</span>
+		<br>
+		<%= f.text_field :name %>
 	</div>
 	<div class="field">
-		<%= f.label(:password_confirmation, "Confirm Password") %><br>
-		<%= f.password_field :password_confirmation %>
+		<%= f.label :email %><br>
+		<%= f.email_field(:email) %>
 	</div>
 	<div class="field">
 		<%= show_simple_captcha %>