Revert "ditching the selected layout"

This reverts commit dea41171bde090519cb02b45ed64e3d93234af5d.