Refactor DisplayEngine