Changelog:
-added comboBox contents
-changed the layout