more preparation for layout modularization