Fix column layout problems.
Modify design slightly.