Matched Michelle's layout as much as possible.
Merge branch 'semantic-col-merged' of https://github.com/frankbaffle/omnomnom into semantic-col-merged