Formatted all new/edit forms into common format.
Fixed tests
Merge pull request #37 from alphasusu/form-reformat

Formatted all new/edit forms into common format