Replace query box with tool box
Merge conflicts in index.html