WIP
wip
new desgin
Merge branch 'origin/new_design'
wip