Submitted version.  Made minor change to toorbars