Added formatting for figures