table-layout related changes