More work on the Menu Manager