Prevent overhang of admin body categories table.

Group things together more simply. Fixes #738.