Fixing two column layout.
Merged in master