fixes for the menus feature