Improve r96548: fixed one fatal, restored user tool links and removed a little duplic...