Fixed drop down menus so that they change with the data source