Add ControlPanel. Clean up a bit.