Quick changes to replace tool GUI