Merge branch 'UI_to_add_participants'
WIP