added expand/collapse and title