Added icon key for category groups. Added logging during group expand/collapse
for debugging. Added a couple of null-checks to avoid exceptions in the UI.