Moved screens section into subheader container