Reworked text placement and wrapping