Added expand/collapse for building