wip, keep navigation selection