Rearrange nav, various tweaks