Work on positioning text
Merge remote-tracking branch 'origin/development' into development
Tests need work to pass