Navigation List fixes
Navigation List fixes