More main menu active class fixes