Add custom font support and other UI fixes
merge