add .row to wrap yield
Merge branch 'mvp' into sandbox-deploy