Move some figures, polish the text.