fixes on page mode