Fix Active Display & Remove Duplicates