Add navigation handler (working)