Improve Tools and Ranking templates.