Convert sidebar to nav-list.
Merge branch 'navlist'