Pop branch tweaks (nav bar, colors)
Merge branch 'jon' into sprint10