Revert "Re-write menu as a list"

This reverts commit 38abc524af6898ac6e5d73f889655466444d6bd1.