Refactor with controller + pronouns
Error handling
Use html5 error handling