Use nameref, change wording, change node spacing