Refactor ControlPanelManager