Fixed some inconsistencies in layout for the *ControlPanels