Make menu work again
Add test for menu
roll version