little clean up of navigation