MT#7155 Improve script output layout (fixup)