Revert "Ticket #1279: Refactoring menu links, part 2"

This reverts commit 96e2ce854067bab4603aa04598a2a8e653994386.
Ticket #1279: Keeping same keys to avoid creating new menu entries