Improved content markup.