* Lots of UX tweaks following discussion with @yorkxin; also de-duplicate choices as reported by @kcwu