refactor screen