Cleaned up the events add/update pages