modified dropdown construction to be cleaner