Refactored ScreenSelection to MVC