[Shi] improve figure placement