update design
Merge branch 'design-v3'