Fixed combat layout again