Adding divs around fields for better styles support, plus cleanup