nav bar and small tweaks