Made propertyChanged work for screen changes