First version of a complete 2 column layout. Not perfect but better.