Move nav to top of layout to stretch across the full width; update nav structure