Form validation, restructure app