Fixed active nav issues again