Numerous improvements

Fixes issue with category group headings not rendering and adds
indenting nested categories.