finished with css + fixed the attendee not updating
fixed merge conflicts