Validations added and nav props changed