Some reworks
Remove _pages