Fixed final bugs with Make dropdown and all other dropdowns