Nav bar + other tweaks