Fixed page order and added more pages