Further Font changes

Have fixed the errors in the code. Just making sure further rendering
issues are fixed.