ENH: simplify layout.