fix combat view