Revert "reorganization of menu items"

This reverts commit 3e578e545f975c6c205a7b4e860e9b6df5fa8e2a.
Revert "Revert "reorganization of menu items""

This reverts commit 8108d10716cf3f08334a969cc37a0e73c85472e2.
Revert "Revert "Revert "reorganization of menu items"""

This reverts commit 559c8b38374cd35c08db1c10a0abf44a0f095b80.