Font anti-aliasing fix
Merge conflict resolved