Fixed more layouts
Merge branch 'master' of https://github.com/matbern/FitnessTracker