Volunteer changes

Moved it to just one page instead of new/edit. Reworked some of the code
in the class, etc. General cleanup.