Creating fight methodm, add popup struct and make some fixes