updated layout, index