Move container div

Remove container div from each template.  Add container div surrounding the content block in the layout.