refactoring small things

Just touching up some of the forms, and making them more uniform to prep for partials.