Nav mods.
New SCSS files for updated nav.
Conflicts resolved.