Some minor changes on code generated. (divs instead of span)