Adds image support
Tightens figure margins