Improve how options are displayed