fixed nav children issue
merged with staging