Edit Modify layout and adding "Waypoint" item menu into it