GUI overhaul, progress on battles, other changes