clean up forms *in_love_with_new_code*
fixed names in dropdown for edit form