WP-2798 Add the div tags for theming