Tidied ControlPanel