Fixed remaining layouts
Merge branch 'master' of https://github.com/matbern/FitnessTracker
Merge branch 'master' of https://github.com/matbern/FitnessTracker
fixed layout
Fixed conflict
Fixed conflict
Fixed layouts. Fixed toast messages.