Another refactoring of the abstract screens.