Update sizing for device width 640px
Merge remote-tracking branch 'origin/master'