Fix font and a bug