fix some of menu wrap