Merge "Fix misc font sizes and spacing issues"