Rearrange navigation