correct order of components and add the combo box solutions