Add design
Merge branch 'feature/design' into develop