Nav class fixes