Added helper and data-tags for pages