expandable buttons complete

Finally got this to expand on click correctly, but for some reason they
don't collapse on second click.  It's enough to fake it in the
presentation though.