Updated the participant control
Fixed merge conflicts
Fixed style for participant
fixed merge conflicts
polished up the participant control
prettified the participants-control