Fixed text wrapping issues

Closes #4