Revert "Revert "Menu""

This reverts commit 9f950326647f943d38d4fac8cc93c5b94790deea.