Break out the navbar into its own include.
Adjustments to organize the navbar and the content.