Fix text wrap and small text correction