Introduced LayoutScreen with external ScreenLayout.  Previous screen now should be tracked entirely by Screen.