Refactoring the dropdpwn list