Updated container elements

Incorporated suggestions from @fordmadox for much better container id
stuff. Added similar changes to the site.