Revert "more menu fixes"

This reverts commit 052a1dd9b7c324c82dbad2ea7fc9055fa385cf6e.