More layout/styles
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
hi
Merge branch 'master' of https://github.com/jdl39/HappinessTracker