Content block refactor so that multiple blocks on the same page can be saved independently