Category improvement & Fonts fix