[CL] Complete data storing bug fixed and minor UI update