Added sub-categories, expandable dropdowns