Added CPI format (for personal use) and imposed limit on all page display