Refactor how text drawing works, remove leftovers from the merge