Revamp SelectorPanel Interface