Address PR feedback for displayBuilder