Overall update to include titles for links