Rearrange navigation order