Fixed layout issues with text wrapping