Revert "2 column"

This reverts commit 50eb2b95ed644cc59180714583a4c9c9f5e2fab3.
revert
Revert "Revert "2 column""

This reverts commit d786edb2f59dce164d19d8bd3a758029d433a4b2.
Merge remote-tracking branch 'origin/master'