New layout for figures