Improve the control panel