Change to the way drop down items are formed and used