Refactor display, use ZCA