Navigation behavior modified, tested, should be good.