Screen now part of window struct