cup page and fixtures changes