try new font
fix layout
merge conflict