font and other fix
merge conflict