Issue #63: Fix menus, again