move nav into partial; rejigger content some more