Tweak layout and rebuild figure