Revert "commit"

This reverts commit de796720fe1d5463dce0f9d3566288eff5d703c4.
Revert "menu"

This reverts commit 30c1f0881fa54b10f334b1b4cc63611cd1fb94bf, reversing
changes made to 0e0151a9f0d7185ac511bda9f2bbbe5e8b597e91.