Go back to Sept 2013 version of prompt form
Revert "Go back to Sept 2013 version of prompt form"

This reverts commit d088248147f509ed00bfd22cdba398267b700e3b.
4125 Can't remove prompt when a tag type is required
4125 Spaces not tabs
Merge pull request #1887 from sarken/issue_4125

4125 Challenge: Can't remove request or offer if a type of tag is required