fixups on layout.