Changes to fix menu