work-in-progress on script->layout changes