At least they added the rematch feature at the end of a battle. I often find myself stuck on a particularly hard fight for many attempts till I get it right.