diff --git a/views/gamification_plugin_badges/_form.html.erb b/views/gamification_plugin_badges/_form.html.erb
index c74dd37..8f6852b 100644
--- a/views/gamification_plugin_badges/_form.html.erb
+++ b/views/gamification_plugin_badges/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(@gamification_plugin_badge, :url => {:action => @gamification_plugin_badge.new_record? ? :create : :update}) do |f| %>
+<%= form_for(@gamification_plugin_badge, :url => {:action => @gamification_plugin_badge.new_record? ? :create : :update, :id => @gamification_plugin_badge.id }) do |f| %>
   <% if @gamification_plugin_badge.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@gamification_plugin_badge.errors.count, "error") %> prohibited this gamification_plugin_badge from being saved:</h2>
@@ -13,7 +13,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.select :name, Merit::BadgeRules::AVAILABLE_RULES.map{ |key, rule| key } %>
   </div>
   <div class="field">
     <%= f.label :description %><br />
diff --git a/views/gamification_plugin_badges/index.html.erb b/views/gamification_plugin_badges/index.html.erb
index c02a040..6ff5ea6 100644
--- a/views/gamification_plugin_badges/index.html.erb
+++ b/views/gamification_plugin_badges/index.html.erb
@@ -27,3 +27,4 @@
 <br />
 
 <%= link_to 'New Badge', :action => :new %>
+<%= link_to 'Back', :controller => 'gamification_plugin_admin', :action => :index %>
--
libgit2 0.21.2