Merge branch 'release/initial_deploy'
fixed the typo on the layout page
Merge branch 'hotfix/fixing_typo' into develop