Form Layout Cleanup
Merge pull request #15 from jbbrokaw/shaneB

Reviewed it, looks solid.