[1603] added p2.index for inclusion in p2 site, changed layout