change custom dojo props to data-dojo-props
various string cleanups
fix some indentation
clean up some strings