New navigation layout
Merge branch 'new_nav_layout'