v2 changes, active state links wip