Revert "more changes with menu button"

This reverts commit 43a669db8ddb4618d69fb479e32f71957c594b58.