added upcoming events
changed the order of the fields in the event form and minor bug fixes in the map-editor