Fix layout.
More cleanup.