working on columns for phablets despite the internet sucking hardcore
Merge branch 'adaptive' into dev