First stab at fixing box text placement.
Fix remaining issues with paragraph text position

It turns out git does a bad job with line endings, hence the diff for
this file is not useful.