Smoother 2 column layout
* should fix #624