More style fixes on fights