Changes to Menu and LocationTree