fixup layout