Fix comboboxes and changed edit order
added supplier name to comboboxes