form refactor
Merge pull request #79 from LegoStormtroopr/forms-refactor

form refactor