Takeshi Nishimura\'s menu fixes