Fixes to layout font adjustments