Better navigation for Manage CCs