refactor and improve font display