New design
minor fixes
Merge branch 'release/2.4-New_design'