major nav design changes and scss cleanup
merging changes