Updating ui to include error messages and better validation