Layout Improvements

See the line notes on this commit.