Fixed conflicting shortcuts
Fixed bucket tool