Fix dropdowns once and for all