Moved page blocks saving to a syncBlocks method + cleanup