navbar and other tweaks