CON-1790 Code review feedback, and add (temporary) figure styling