Rebuilt to include analytics on preview pages