export font changed, some code restructuring