Externalized navbar and modal
Merge branch 'master' of https://github.com/idamai/FitBud