Added display of tools and tags