I think you can improve the grades and CGPA by retake those subjects which have bad grades.

However, a general theory about CGPA is it's easy to lose, hard to gain.