Updated layout of the figures