add screenwatcher to screen
cleaner implementation