Integrate the design
Merge branch 'feature/one_page_design' into develop