tag some more div's with an id or name attribute

to make them easier accessible with css
Merge branch '4.2/tag-more-divs' into 4.2-trunk