Fixed combat layout AGAIN