added ids/spans and title