Code optimization & Fixed another  display error