Some more work on the new menu system