Fixed text flow issues