Refactor figure margins to match body padding