Merge pull request #3022 from abarth/polish_selection_controls

Polish selection controls