Fix combo boxes in the screen panel
Remove some unused items from screen panel