re-arrange figures again