Refactoring and Partner Control
Improved Selector GUI