Fix Tools URLs and elements

Fix Tools URLs and elements