Improvements to the selection system in the GUI