Sections refactor2

Refactors and finally tests the category sections.