Modified the ordering of the nav bar; a few cleanups in descriptions.