some layout and design stuff
Merge branch 'master' of https://github.com/adsmit14/ember-fitness