updating UI, adding Context Switch
adding click event to circle instead of group