Move more input validation into html