3 column layout
Merge branch 'master' into layout-switch
Interface cleanup
Merge branch 'layout-switch'