Templates updated with ARIA