refactored screen classes