Simplified category setup

[stephtara (Stephanie Booth)]

Haven’t tested yet but it really looks like it’s going in the right direction to me!