design updated.
Merge branch 'design'