Add font and small fixes