Fix more broken menu active classes