Refactored the screen module