move forms around
Merge pull request #44 from domino14/improvement/43/forms

move forms around. close #42