Add category tree list, misc cleanup