Moving more pages into page builder

Moving more pages into page builder