M&S on the mend