Second pass on CP > Build > Layout tour #4286
Merge pull request #4666 from openscholar/4286-layout2

Second pass on CP > Build > Layout tour #4286