Rebuilt the Dropdown "building" code