change device width and ids
Merge branch 'master' into gh-pages