Fix Display Issues After Refactoring