Added expand/collapse capability