Event add screen etc
conflicts resolved