new nav bar + misc tweaks