Changed folder listing to page listing etc.