Reordered font-setting components and fixed small issue
Merge pull request #86 from alex-deaconu/chore/re-order-font

Chore/re-order font setting components