More submission & event form updates