Update ZA menu entries.

Closes #1465
Merge branch '1465-za-nav-changes'