Updated the build tool wizards to close on completion