moved tools menuitems into plugin menu, improved formatting