Add various fixes
Change font-style