refactor screens