Category Page (cleaning  improved)