Layout simplified

Dropped u12 container rows around where and when sections

Nick: this is the changeset to roll back in case it messes up the
layout.