Changed metadata and figures layout