fixed nav styles and prepped for merge