Revert "Revert "layout" Due to modification to schema"

This reverts commit 67453909e4e498bc9a85443f8ce810eb6203aea5.