refactors dropdown and updates naming schema