Toggling role selection, fixing role display