Changed classes position, update, added Combobox (in-working)