style changes and form bug fixes
fixes merge conflicts
Merge pull request #100 from JustAboutJeff/style

style changes and form bug fixes