Added persistent toggle switch of tools