Second update to correct font issues