Fixed issue with tools view