Small changes to Screen