Continued overhaul of drop downs

Work still in progress