Minor changes to Screen