Some small changes to control panel