Misc form and tooltip updates
Merge pull request #55 from shayhowe/master

Misc form and tooltip updates