Tidying up Role selection and button mode