Navigation that works beautifully
Merge branch 'navigation'