Merge branch 'release/redesign'
Merge tag 'redesign' into develop

big redesign