Fix #421: Consistent numbering for tree/table/text view items
Merge pull request #579 from stennie/issue-421

Fix #421: Consistent numbering for tree/table/text view items