Improved more pages