Refactored selection editor