Switch to horizontal columns on tablets
Merge branch 'feature/tablet-columns'