navigation links
Merge branch 'navigation'
resolve conflicts