Changed container divs to classes