Refactor baseline screens.