Revert "Layout Module updates: STILL INITIAL COMMIT"

This reverts commit a8de2a1f78ff3acbf4ecb506ad30f2960869518a.