Added comboboxes and remade the design