Fix tests & update fight page style