Fixed some errors, move fonts to builder