Convert to 2 column layout
Merge branch 'python3'