Feature dropdown sort

Fix to structure the sort drop downs globally