Keep the value for the layout and views.

This will need to be squash in the previous commit of this branch.