Refactor Tractor on the menu
Fixed merge