Update templates to be more screen reader friendly