Many changes to ControlPanel GUI
Merge complete