some UI updates for selection and behaviour