Add categories listing page. Perfomance improvements to others.