Accomodate to refactoring
Fix font issue