Update layout.
More changes.