Refinements to allow customization of figure layout