add pages and fix Organization/Person