Changed the navigation selection and added validation