added collapse/expand all button and text changes