New navigation layout

Depends on #1365.