added modal and tools