Web refactored, data formats changed, added some groupings