Implment default selection and other UI tweaks