Refactor dropdown menu and trigger classification