cleaning up the control panel a little bit