layout & build system changes