Fixed text fit issues