Fixed the combatant view. Closes #23