Minor adjustments.
Revised DOM structures.