More improvements + edit button for events