feature modified to better manage menu order