text layout & fixes