Fixing dropdown bug and getting rid of index once and for all ... hopefully