Redesign changes
Merge branch 'master' into resp-web