updated layout, and data