more fixups with new layout