big rewrite (again)

Sorry ... couldn't help myself.  We now have buttons to expand and contract nodes for us as well as some other fixups and restructuring.