fix design
Merge branch 'feature/adjust_design'