Add Event days, fix wrapping