screens refactored