Seperated battle and location. Map is now main