Add NodeSet dropdown.  Code cleanup.