show blocks on main
Merge branch 'feature/blocks-86' into staging

Conflicts:
	app/views/web/welcome/index.html.haml