diff --git a/lib/galaxy/web/controllers/forms.py b/lib/galaxy/web/controllers/forms.py
index abdc51fec54..e72db7b24e4 100644
--- a/lib/galaxy/web/controllers/forms.py
+++ b/lib/galaxy/web/controllers/forms.py
@@ -313,10 +313,10 @@ class Forms( BaseController ):
         ctr=0
         sb_options = []
         while True:
-            option = params.get( 'field_'+str(index)+'_option_'+str(ctr), None ) 
-            ctr = ctr+1
-            if option:
+            if kwd.has_key( 'field_'+str(index)+'_option_'+str(ctr) ):
+                option = params.get( 'field_'+str(index)+'_option_'+str(ctr), None ) 
                 sb_options.append(util.restore_text(option))
+                ctr = ctr+1
             else:
                 return sb_options
     def __get_saved_form(self, fd):
@@ -342,8 +342,8 @@ class Forms( BaseController ):
         layout = []
         index = 0
         while True:
-            grid_name = util.restore_text( params.get( 'grid_layout%i' % index, '' ) )
-            if grid_name:
+            if kwd.has_key( 'grid_layout%i' % index ):
+                grid_name = util.restore_text( params.get( 'grid_layout%i' % index, '' ) )
                 layout.append( grid_name )
                 index = index + 1
             else:
@@ -355,7 +355,7 @@ class Forms( BaseController ):
             # get the user entered fields
             index = 0
             while True:
-                if params.get( 'field_name_%i' % index, False ):
+                if kwd.has_key( 'field_name_%i' % index ):
                     fields.append( self.__get_field( index, **kwd ) )
                     index = index + 1
                 else:
diff --git a/templates/admin/forms/manage_forms.mako b/templates/admin/forms/manage_forms.mako
index c18cad2b152..e1ed9256fee 100644
--- a/templates/admin/forms/manage_forms.mako
+++ b/templates/admin/forms/manage_forms.mako
@@ -23,7 +23,7 @@
                 </div>
             %else:
                 <div popupmenu="form-${form.id}-popup">
-                    <a class="action-button" href="${h.url_for( action='edit', form_id=form.id, show_form=True )}">Edit form definition</a>
+                    <a class="action-button" href="${h.url_for( action='edit', form_id=form.id, show_form=True )}">Edit</a>
                     <a class="action-button" confirm="Click OK to delete the form ${form.name}." href="${h.url_for( action='delete', form_id=form.id )}">Delete</a>
                 </div>
             %endif
diff --git a/templates/admin/forms/show_form_read_only.mako b/templates/admin/forms/show_form_read_only.mako
index 1909dd5224e..ad2f4a5afb5 100644
--- a/templates/admin/forms/show_form_read_only.mako
+++ b/templates/admin/forms/show_form_read_only.mako
@@ -63,14 +63,14 @@
 
 <div class="toolForm">
     %if form.desc:
-        <div class="toolFormTitle">${form.name} - <i>${form.desc}</i>
+        <div class="toolFormTitle">${form.name} - <i> ${form.desc}</i> (${form.type})
             <a id="form-${form.id}-popup" class="popup-arrow" style="display: none;">&#9660;</a>
             <div popupmenu="form-${form.id}-popup">
                 <a class="action-button" href="${h.url_for( action='edit', form_id=form.id, show_form=True )}">Edit</a>
             </div>
         </div>
     %else:
-        <div class="toolFormTitle">${form.name}
+        <div class="toolFormTitle">${form.name} (${form.type})
         <a id="form-${form.id}-popup" class="popup-arrow" style="display: none;">&#9660;</a>
         <div popupmenu="form-${form.id}-popup">
             <a class="action-button" href="${h.url_for( action='edit', form_id=form.id, show_form=True )}">Edit</a>