Basic menu, update client
Revert "Basic menu, update client"

This reverts commit 9621c3a830f01c2231535007a311592733924072.
Revert "Revert "Basic menu, update client""

This reverts commit db08720b87b92188cff3bc649a381951df812d94.