improvements to tools toggle