Layout stuff...
Merge branch 'master' of https://github.com/ashinskyd/GamifyHealth