Revert "Change layoutoptions to layoutobjects"

This reverts commit 7d3ce8056052e02671a469bd6868af767e4afcfd.
Naming convention for layout and objects
Merge branch 'develop'