Add line breaks, change references to Widget properties to use hash notation