improve categories and top level one (for header)