Improved the semantic corectness of the markup.