Drop down improvements/refactoring