Refactor Screen to simplify and unify rendering