Minor router selection UI changes