Continued refactor work on view manager to extract the different view concepts into different classes.