updated button and nav
Merge branch 'master' of https://github.com/andrewhooge/Life_Tracker