Array of Figures

Completed redesign to use array of Figures