Add stack display, refactor other displays