Update design.
Merge branch 'develop'