Fix ControlPanel