Refactor display, use ZCA

This includes commits from #133 and should be pulled afterwards.