Polish dropdown menu, refactor