Refactor dropdowns
Improve urls