Uplift other screens into MVC