Fixed final layout issues.

More copy/pasta...