refactor screen
refactor draw