Refactor and fix text rendering on the face