Fixes to font adjustment
Fix layout font adjustment