Tidy up ScreensPanel code a bit.