Fixed buttons and fields
Merge pull request #1 from michellefish/front-refactor

merged