Rework navigator
Fix conflit