layout fixup