Added expand/collapse buttons and dynamic height