Made UI changes and fixed color issues
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Made minor UI changes