more width stuff
Merge branch 'large-displays'