Added containers around the elements