Basic nav styling
fix merge