Add Group Combobox, add Target Version and Category switches