Flexible width
Merge branch 'design-20131017'

* design-20131017:
  Flexible width