Fixes a couple layout quirks.