Refactored drop down menues