Refactoring to ease theh adding of new screens.