refactoring and add fonts