Refactor display block