WIP fix menu display