Ticket #1279: Refactoring menu links, part 2