Adds category group collapsing as per #6