Made some adjustments to how comboboxes are loaded