Move display logic into Screen