minor screen refactoring