Fixing up category ordering/hierarchy