fixup format layout