Issues/2183 layout glitch

This is a partial fix to the glitches described in #2183. It resolves the biggest offenders but does not yet close the issue.