some text placement changes
added some behavior
Merge branch 'placement' into develop