Changed Buttons to Color and Fixed Form Formatting
Merge pull request #19 from Fit-Genie/FixingButtons

Changed Buttons to Color and Fixed Form Formatting
fix merge conflicts