pulled from jean
property page styloing
merge conflics fixed