rich: moved nav to layout