separate collapse/expand row function and add aria-expanded support