Adds back cat-id-[ID] CSS class, and cleans up the proposed code a bit