add fonts
Merge remote-tracking branch 'origin/master'
Cleanup code and improve UI performance