refactor and make fonts local for some known concerns