Add named anchors, move around project order slightly