Add other font and fix small issues