Improve layout.
More work.