More work on new menu system