A small cleanup and documentation.  Simplified tha way to define options for the drop downs in the toolbars.