Fix for screens + layout improvements

Fixed the screens continuing to move on, even when they should pause
when looking at a graph.