fixed add layout with old blocks
fixed layout save localstroage bug
Merge branch '0718-2'