Added font and fixes