Improve control panel