Update figures and wordings