Major update. IPI and discovery pages done.