Added new forms and updated event listeners