Nav changes merged.

Merged nav styles and other updates.