Chore/re-order font setting components

@donnapep @stulees please review. Will need a rebase before merge. Thanks.