+1 for the categories suggestion.
I was imagining something where the categories can be collapsed when they’re not needed.