Navigation stuff.
routing problems, not fixed.
Routes fixed. Navigation fixed.
Merge branch 'navigation_1.2'