Tweaking layout.

Not done.