Minor changes to control-panel layout