Revert "Menu Class"

This reverts commit 704c8a75819bab0db0a81168482ba000b295c286.
Revert "Revert "Menu Class""

This reverts commit 1ca02ec36ad4def9bd8aecfccae478be6bfcce2a.