Small modifications to improve the display of GUI in control panel