more changes to resolve font issues