Merge branch 'staging'
Fix css styles
Merge branch 'new-site-integration' into staging