Usability improvements on OptionSet (focus, enterKey, prevent duplicates)