Font and layout tweeks
Merge conflicts resolved