Revert "Menu changes."

This reverts commit ef2b8ddf8d6989aa176aa6af92c9eac8719dbacf.