Clean up forms and views
Merge pull request #53 from modernlegend/fix_forms

Clean up forms and views