consolidated navbar code
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator

consolidating code