Added more fixes to layout as a result of updated font choices.