Cleaned up markup for figures and boxes