Changed to use the new container-row element