added Size to Screen + minor