Fix code for assigning array, Change save behavior
Merge branch 'page-layout'