add expand/collapse buttons, not wired up yet