most of the navigation layout is done
Merge branch 'nav'