changed fonts
fixes
merge