More layout modularization