fixing UI bugs - switch role incomplete