Better tyles and fix tool deletion