Fixed xp, popup spell menu issues