Add Conflicts window, Export command and improve UI