Fixed some validation errors
Navigation fix