Nav bar tweaks, fixes