Code cleanup, form validation, frontend structure edit