fixed navigation and add some validations