Corrected some issues in control panel