fix rending bug, scale down x dimension
repositioned expand nodes
Merge pull request #231 from dburdick/release-1.22

fix for SWC-466